summaryrefslogtreecommitdiff
path: root/Build/source
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2024-02-27 20:51:03 +0000
committerKarl Berry <karl@freefriends.org>2024-02-27 20:51:03 +0000
commit9ab1f2607e5c04df3cbeecf67c0c52956416ed1d (patch)
treeffc7153df8c7bf085ddad2ca2162fb5af7277753 /Build/source
parentd17bed7049c85db6da51c9e2e72ff6e468e4cbc6 (diff)
asy 2.87 sources
git-svn-id: svn://tug.org/texlive/trunk@70212 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source')
-rw-r--r--Build/source/utils/asymptote/ChangeLog1030
-rw-r--r--Build/source/utils/asymptote/GUI/Window1.py7
-rw-r--r--Build/source/utils/asymptote/GUI/icons_rc.py3574
-rw-r--r--Build/source/utils/asymptote/GUI/pyUIClass/custMatTransform.py2
-rw-r--r--Build/source/utils/asymptote/GUI/pyUIClass/labelTextEditor.py2
-rw-r--r--Build/source/utils/asymptote/GUI/pyUIClass/setCustomAnchor.py2
-rw-r--r--Build/source/utils/asymptote/GUI/pyUIClass/widg_addLabel.py2
-rw-r--r--Build/source/utils/asymptote/GUI/pyUIClass/widg_addPolyOpt.py2
-rw-r--r--Build/source/utils/asymptote/GUI/pyUIClass/widg_editBezier.py2
-rw-r--r--Build/source/utils/asymptote/GUI/pyUIClass/widgetPointEditor.py2
-rw-r--r--Build/source/utils/asymptote/GUI/pyUIClass/window1.py2
-rwxr-xr-xBuild/source/utils/asymptote/GUI/xasy2asy.py5
-rw-r--r--Build/source/utils/asymptote/LspCpp/CMakeLists.txt38
-rwxr-xr-xBuild/source/utils/asymptote/LspCpp/examples/StdIOClientExample.cpp3
-rwxr-xr-xBuild/source/utils/asymptote/LspCpp/examples/StdIOServerExample.cpp2
-rwxr-xr-xBuild/source/utils/asymptote/LspCpp/examples/TcpServerExample.cpp2
-rw-r--r--Build/source/utils/asymptote/LspCpp/include/LibLsp/JsonRpc/GCThreadContext.h4
-rw-r--r--Build/source/utils/asymptote/LspCpp/include/LibLsp/JsonRpc/MessageProducer.h11
-rw-r--r--Build/source/utils/asymptote/LspCpp/include/LibLsp/JsonRpc/RemoteEndPoint.h5
-rw-r--r--Build/source/utils/asymptote/LspCpp/include/LibLsp/JsonRpc/StreamMessageProducer.h77
-rw-r--r--Build/source/utils/asymptote/LspCpp/include/LibLsp/JsonRpc/optionalVersion.h13
-rw-r--r--Build/source/utils/asymptote/LspCpp/include/LibLsp/JsonRpc/serializer.h22
-rw-r--r--Build/source/utils/asymptote/LspCpp/include/LibLsp/JsonRpc/threaded_queue.h7
-rw-r--r--Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/ClientPreferences.h8
-rw-r--r--Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/CodeActionParams.h2
-rw-r--r--Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/ExecuteCommandParams.h2
-rw-r--r--Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/ResourceOperation.h18
-rw-r--r--Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/extention/jdtls/getMoveDestinations.h2
-rw-r--r--Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/extention/jdtls/getRefactorEdit.h6
-rw-r--r--Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/extention/jdtls/searchSymbols.h6
-rw-r--r--Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/extention/sonarlint/protocol.h42
-rw-r--r--Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/general/InitializeParams.h20
-rw-r--r--Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/general/exit.h2
-rw-r--r--Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/general/lsClientCapabilities.h10
-rw-r--r--Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/general/lsServerCapabilities.h130
-rw-r--r--Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/general/lsTextDocumentClientCapabilities.h146
-rw-r--r--Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/general/lsWorkspaceClientCapabilites.h56
-rw-r--r--Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/general/progress.h2
-rw-r--r--Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/general/shutdown.h2
-rw-r--r--Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/language/language.h2
-rw-r--r--Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/location_type.h2
-rw-r--r--Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsAny.h2
-rw-r--r--Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsCodeAction.h10
-rw-r--r--Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsCommand.h2
-rw-r--r--Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsFormattingOptions.h14
-rw-r--r--Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsMarkedString.h2
-rw-r--r--Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsResponseError.h2
-rw-r--r--Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsTextDocumentPositionParams.h2
-rw-r--r--Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsTextEdit.h6
-rw-r--r--Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsVersionedTextDocumentIdentifier.h2
-rw-r--r--Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsWorkspaceEdit.h8
-rw-r--r--Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsp_completion.h38
-rw-r--r--Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsp_diagnostic.h15
-rw-r--r--Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/out_list.h2
-rw-r--r--Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/symbol.h12
-rw-r--r--Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/SemanticTokens.h12
-rw-r--r--Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/callHierarchy.h12
-rw-r--r--Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/code_lens.h4
-rw-r--r--Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/completion.h6
-rw-r--r--Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/didRenameFiles.h4
-rw-r--r--Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/did_change.h6
-rw-r--r--Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/did_open.h2
-rw-r--r--Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/did_save.h2
-rw-r--r--Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/document_link.h8
-rw-r--r--Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/document_symbol.h2
-rw-r--r--Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/hover.h10
-rw-r--r--Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/linkedEditingRange.h4
-rw-r--r--Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/prepareRename.h2
-rw-r--r--Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/references.h2
-rw-r--r--Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/resolveTypeHierarchy.h2
-rw-r--r--Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/selectionRange.h4
-rw-r--r--Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/signature_help.h10
-rw-r--r--Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/typeHierarchy.h16
-rw-r--r--Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/willSave.h2
-rw-r--r--Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/utils.h4
-rw-r--r--Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/workspace/applyEdit.h2
-rw-r--r--Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/workspace/workspaceFolders.h2
-rwxr-xr-xBuild/source/utils/asymptote/LspCpp/src/jsonrpc/GCThreadContext.cpp4
-rwxr-xr-xBuild/source/utils/asymptote/LspCpp/src/jsonrpc/RemoteEndPoint.cpp26
-rwxr-xr-xBuild/source/utils/asymptote/LspCpp/src/jsonrpc/StreamMessageProducer.cpp178
-rwxr-xr-xBuild/source/utils/asymptote/LspCpp/src/jsonrpc/TcpServer.cpp40
-rwxr-xr-xBuild/source/utils/asymptote/LspCpp/src/jsonrpc/WebSocketServer.cpp2
-rwxr-xr-xBuild/source/utils/asymptote/LspCpp/src/lsp/ParentProcessWatcher.cpp1
-rwxr-xr-xBuild/source/utils/asymptote/LspCpp/src/lsp/initialize.cpp2
-rwxr-xr-xBuild/source/utils/asymptote/LspCpp/src/lsp/lsp.cpp4
-rwxr-xr-xBuild/source/utils/asymptote/LspCpp/src/lsp/textDocument.cpp4
-rwxr-xr-xBuild/source/utils/asymptote/LspCpp/src/lsp/utils.cpp2
-rw-r--r--Build/source/utils/asymptote/LspCpp/third_party/rapidjson/CMakeLists.txt7
-rw-r--r--Build/source/utils/asymptote/LspCpp/third_party/rapidjson/bin/unittestschema/address.json5
-rw-r--r--Build/source/utils/asymptote/LspCpp/third_party/rapidjson/contrib/natvis/rapidjson.natvis20
-rw-r--r--Build/source/utils/asymptote/LspCpp/third_party/rapidjson/doc/features.md10
-rw-r--r--Build/source/utils/asymptote/LspCpp/third_party/rapidjson/doc/schema.md8
-rw-r--r--Build/source/utils/asymptote/LspCpp/third_party/rapidjson/example/schemavalidator/schemavalidator.cpp3
-rw-r--r--Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/allocators.h3
-rw-r--r--Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/document.h34
-rw-r--r--Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/error/en.h56
-rw-r--r--Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/error/error.h77
-rw-r--r--Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/internal/biginteger.h2
-rw-r--r--Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/internal/diyfp.h2
-rw-r--r--Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/internal/dtoa.h10
-rw-r--r--Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/pointer.h30
-rw-r--r--Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/rapidjson.h2
-rw-r--r--Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/reader.h4
-rw-r--r--Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/schema.h731
-rw-r--r--Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/unittest/cursorstreamwrappertest.cpp2
-rw-r--r--Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/unittest/encodedstreamtest.cpp2
-rw-r--r--Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/unittest/ostreamwrappertest.cpp2
-rw-r--r--Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/unittest/pointertest.cpp6
-rw-r--r--Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/unittest/schematest.cpp659
-rw-r--r--Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/unittest/simdtest.cpp14
-rw-r--r--Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/unittest/uritest.cpp85
-rw-r--r--Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/unittest/valuetest.cpp20
-rw-r--r--Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/valgrind.supp9
-rw-r--r--Build/source/utils/asymptote/LspCpp/third_party/uri/CMakeFiles/CMakeDirectoryInformation.cmake6
-rw-r--r--Build/source/utils/asymptote/LspCpp/third_party/uri/CMakeFiles/doc.dir/DependInfo.cmake4
-rw-r--r--Build/source/utils/asymptote/LspCpp/third_party/uri/CMakeFiles/doc.dir/build.make14
-rw-r--r--Build/source/utils/asymptote/LspCpp/third_party/uri/Doxyfile8
-rw-r--r--Build/source/utils/asymptote/LspCpp/third_party/uri/Makefile44
-rw-r--r--Build/source/utils/asymptote/LspCpp/third_party/uri/cmake_install.cmake6
-rw-r--r--Build/source/utils/asymptote/LspCpp/third_party/uri/src/CMakeFiles/CMakeDirectoryInformation.cmake6
-rw-r--r--Build/source/utils/asymptote/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/DependInfo.cmake20
-rw-r--r--Build/source/utils/asymptote/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/build.make112
-rw-r--r--Build/source/utils/asymptote/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/compiler_depend.internal3185
-rw-r--r--Build/source/utils/asymptote/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/compiler_depend.make3609
-rw-r--r--Build/source/utils/asymptote/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/flags.make6
-rw-r--r--Build/source/utils/asymptote/LspCpp/third_party/uri/src/Makefile92
-rw-r--r--Build/source/utils/asymptote/LspCpp/third_party/uri/src/cmake_install.cmake4
-rw-r--r--Build/source/utils/asymptote/LspCpp/third_party/utfcpp/CMakeLists.txt26
-rw-r--r--Build/source/utils/asymptote/LspCpp/third_party/utfcpp/README.md40
-rw-r--r--Build/source/utils/asymptote/LspCpp/third_party/utfcpp/source/utf8/checked.h22
-rw-r--r--Build/source/utils/asymptote/LspCpp/third_party/utfcpp/source/utf8/core.h49
-rw-r--r--Build/source/utils/asymptote/LspCpp/third_party/utfcpp/source/utf8/cpp11.h2
-rw-r--r--Build/source/utils/asymptote/LspCpp/third_party/utfcpp/source/utf8/cpp17.h2
-rw-r--r--Build/source/utils/asymptote/LspCpp/third_party/utfcpp/source/utf8/unchecked.h19
-rw-r--r--Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/CMakeLists.txt18
-rw-r--r--Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/apitests.cpp6
-rw-r--r--Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/noexceptionstests.cpp4
-rw-r--r--Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/test_checked_api.h (renamed from Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/test_checked_api.cpp)25
-rw-r--r--Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/test_checked_iterator.h (renamed from Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/test_checked_iterator.cpp)7
-rw-r--r--Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/test_unchecked_api.h (renamed from Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/test_unchecked_api.cpp)43
-rw-r--r--Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/test_unchecked_iterator.h (renamed from Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/test_unchecked_iterator.cpp)6
-rw-r--r--Build/source/utils/asymptote/LspCpp/third_party/utfcpp/utf8cppConfig.cmake.in6
-rw-r--r--Build/source/utils/asymptote/Makefile.in4
-rw-r--r--Build/source/utils/asymptote/ReleaseNotes29
-rw-r--r--Build/source/utils/asymptote/asy-keywords.el6
-rw-r--r--Build/source/utils/asymptote/asy.list575
-rw-r--r--Build/source/utils/asymptote/asymptote.spec2
-rw-r--r--Build/source/utils/asymptote/base/geometry.asy169
-rw-r--r--Build/source/utils/asymptote/base/graph3.asy21
-rw-r--r--Build/source/utils/asymptote/base/mapArray.asy9
-rw-r--r--Build/source/utils/asymptote/base/plain.asy19
-rw-r--r--Build/source/utils/asymptote/base/plain_shipout.asy8
-rw-r--r--Build/source/utils/asymptote/base/shaders/fragment.glsl2
-rw-r--r--Build/source/utils/asymptote/base/three.asy25
-rw-r--r--Build/source/utils/asymptote/base/three_surface.asy50
-rw-r--r--Build/source/utils/asymptote/base/three_tube.asy10
-rw-r--r--Build/source/utils/asymptote/base/v3d.asy13
-rw-r--r--Build/source/utils/asymptote/base/v3dheadertypes.asy2
-rw-r--r--Build/source/utils/asymptote/base/v3dtypes.asy2
-rw-r--r--Build/source/utils/asymptote/build-scripts/HOWTO-MSWindows4
-rwxr-xr-xBuild/source/utils/asymptote/build-scripts/build-asymptote4
-rw-r--r--Build/source/utils/asymptote/camp.l46
-rw-r--r--Build/source/utils/asymptote/camp.tab.cc2402
-rw-r--r--Build/source/utils/asymptote/camp.tab.h4
-rw-r--r--Build/source/utils/asymptote/camp.y82
-rw-r--r--Build/source/utils/asymptote/common.h11
-rwxr-xr-xBuild/source/utils/asymptote/config.guess72
-rwxr-xr-xBuild/source/utils/asymptote/config.sub828
-rwxr-xr-xBuild/source/utils/asymptote/configure22
-rw-r--r--Build/source/utils/asymptote/configure.ac6
-rw-r--r--Build/source/utils/asymptote/cudareflect/tinyexr/tinyexr.h2
-rw-r--r--Build/source/utils/asymptote/dec.cc325
-rw-r--r--Build/source/utils/asymptote/dec.h138
-rw-r--r--Build/source/utils/asymptote/doc/CAD.pdfbin198487 -> 198543 bytes
-rw-r--r--Build/source/utils/asymptote/doc/FAQ/asy-faq.info2
-rwxr-xr-xBuild/source/utils/asymptote/doc/FAQ/install-sh443
-rw-r--r--Build/source/utils/asymptote/doc/TeXShopAndAsymptote.pdfbin81303 -> 81270 bytes
-rw-r--r--Build/source/utils/asymptote/doc/asy-latex.dtx4
-rw-r--r--Build/source/utils/asymptote/doc/asy-latex.pdfbin208908 -> 209130 bytes
-rw-r--r--Build/source/utils/asymptote/doc/asy.17
-rw-r--r--Build/source/utils/asymptote/doc/asyRefCard.pdfbin121145 -> 121145 bytes
-rw-r--r--Build/source/utils/asymptote/doc/asymptote.pdfbin1288667 -> 1303978 bytes
-rw-r--r--Build/source/utils/asymptote/doc/asymptote.sty4
-rw-r--r--Build/source/utils/asymptote/doc/asymptote.texi178
-rwxr-xr-xBuild/source/utils/asymptote/doc/install-sh443
-rw-r--r--Build/source/utils/asymptote/doc/latexmkrc3
-rw-r--r--Build/source/utils/asymptote/doc/latexmkrc_asydir4
-rw-r--r--Build/source/utils/asymptote/doc/png/asymptote.info6450
-rw-r--r--Build/source/utils/asymptote/env.cc13
-rw-r--r--Build/source/utils/asymptote/env.h18
-rw-r--r--Build/source/utils/asymptote/errormsg.cc5
-rw-r--r--Build/source/utils/asymptote/errors13
-rw-r--r--Build/source/utils/asymptote/errortest.asy28
-rw-r--r--Build/source/utils/asymptote/errortestTemplate.asy5
-rw-r--r--Build/source/utils/asymptote/examples/filesurface.asy9
-rw-r--r--Build/source/utils/asymptote/examples/triads.asy2
-rw-r--r--Build/source/utils/asymptote/fftw++.h31
-rw-r--r--Build/source/utils/asymptote/fileio.cc40
-rw-r--r--Build/source/utils/asymptote/fileio.h2
-rw-r--r--Build/source/utils/asymptote/fundec.cc28
-rw-r--r--Build/source/utils/asymptote/fundec.h10
-rw-r--r--Build/source/utils/asymptote/gc-8.2.0.tar.gzbin1183225 -> 0 bytes
-rw-r--r--Build/source/utils/asymptote/gc-8.2.4.tar.gzbin0 -> 1210929 bytes
-rw-r--r--Build/source/utils/asymptote/genv.cc59
-rw-r--r--Build/source/utils/asymptote/genv.h11
-rw-r--r--Build/source/utils/asymptote/glrender.cc69
-rwxr-xr-xBuild/source/utils/asymptote/install-sh456
-rw-r--r--Build/source/utils/asymptote/lex.yy.cc46
-rw-r--r--Build/source/utils/asymptote/lspserv.cc6
-rw-r--r--Build/source/utils/asymptote/lspserv.h4
-rw-r--r--Build/source/utils/asymptote/main.cc4
-rw-r--r--Build/source/utils/asymptote/memory.h6
-rw-r--r--Build/source/utils/asymptote/parser.cc9
-rw-r--r--Build/source/utils/asymptote/picture.cc18
-rw-r--r--Build/source/utils/asymptote/process.h7
-rw-r--r--Build/source/utils/asymptote/profiler.h17
-rw-r--r--Build/source/utils/asymptote/psfile.cc24
-rw-r--r--Build/source/utils/asymptote/revision.cc2
-rw-r--r--Build/source/utils/asymptote/runlabel.cc2
-rw-r--r--Build/source/utils/asymptote/runlabel.in2
-rw-r--r--Build/source/utils/asymptote/runpicture.cc106
-rw-r--r--Build/source/utils/asymptote/runpicture.in4
-rw-r--r--Build/source/utils/asymptote/runstring.cc49
-rw-r--r--Build/source/utils/asymptote/runstring.in1
-rw-r--r--Build/source/utils/asymptote/runtime.cc7
-rw-r--r--Build/source/utils/asymptote/runtime.in8
-rw-r--r--Build/source/utils/asymptote/seconds.h49
-rw-r--r--Build/source/utils/asymptote/settings.cc9
-rw-r--r--Build/source/utils/asymptote/stack.cc11
-rw-r--r--Build/source/utils/asymptote/stack.h13
-rw-r--r--Build/source/utils/asymptote/symbolmaps.cc2
-rw-r--r--Build/source/utils/asymptote/symbolmaps.h4
-rw-r--r--Build/source/utils/asymptote/tests/Makefile2
-rw-r--r--Build/source/utils/asymptote/tests/io/csv.asy18
-rw-r--r--Build/source/utils/asymptote/tests/io/input_with_nan.csv5
-rw-r--r--Build/source/utils/asymptote/tests/template/imports/wrapper.asy12
-rw-r--r--Build/source/utils/asymptote/tests/template/imports/wrapperWithEquals.asy11
-rw-r--r--Build/source/utils/asymptote/tests/template/mapArrayTest.asy13
-rw-r--r--Build/source/utils/asymptote/tests/template/singletype.asy33
-rw-r--r--Build/source/utils/asymptote/texfile.cc6
-rw-r--r--Build/source/utils/asymptote/texfile.h14
-rw-r--r--Build/source/utils/asymptote/types.cc17
-rw-r--r--Build/source/utils/asymptote/types.h7
-rw-r--r--Build/source/utils/asymptote/util.cc4
-rw-r--r--Build/source/utils/asymptote/v3dfile.h1
-rw-r--r--Build/source/utils/asymptote/v3dheadertypes.h2
-rw-r--r--Build/source/utils/asymptote/v3dheadertypes.py2
-rw-r--r--Build/source/utils/asymptote/v3dtypes.h2
-rw-r--r--Build/source/utils/asymptote/v3dtypes.py2
249 files changed, 16070 insertions, 12686 deletions
diff --git a/Build/source/utils/asymptote/ChangeLog b/Build/source/utils/asymptote/ChangeLog
index 5c972b52bad..a923fecbafc 100644
--- a/Build/source/utils/asymptote/ChangeLog
+++ b/Build/source/utils/asymptote/ChangeLog
@@ -1,3 +1,1011 @@
+commit 1826b3b38064170d2484af6d9a5e5ac2abce9b77
+Author: John Bowman <bowman@ualberta.ca>
+Date: Mon Feb 26 16:35:57 2024 -0800
+
+ Mark mapArray(string,string) as deprecated.
+
+commit 4ec87566c1204c55248ce57e38127fe583ab3337
+Author: John Bowman <bowman@ualberta.ca>
+Date: Mon Feb 26 15:50:12 2024 -0800
+
+ Improve compiler diagnosic.
+
+commit a89edb5736e69186339d1b799eb50a98d13fc7b2
+Author: John Bowman <bowman@ualberta.ca>
+Date: Mon Feb 26 15:42:41 2024 -0800
+
+ Address issue #421: reduce redundant latexmk runs.
+
+commit 3b02ca59cd8f482f42c89d508795879a643d6195
+Author: John Bowman <bowman@ualberta.ca>
+Date: Mon Feb 26 15:33:30 2024 -0800
+
+ Address issue #424: Add support for latexmk -c.
+
+commit 7551b9e67293d2038a6e5d9c75d389a4cd28822a
+Author: John Bowman <bowman@ualberta.ca>
+Date: Mon Feb 26 11:51:11 2024 -0800
+
+ Address issue #422: update .gitignore.
+
+commit 27d7d04d2ac279443249465b7090fdb8aea1ee1b
+Author: John Bowman <bowman@ualberta.ca>
+Date: Mon Feb 26 11:40:56 2024 -0800
+
+ Address issue #423: give the temporary rendering window a distinctive name.
+
+commit 961f88aa6f754fdb57166cf121b4d707b54d6bcd
+Author: John Bowman <bowman@ualberta.ca>
+Date: Sun Feb 25 23:19:48 2024 -0800
+
+ Add settings.v3d option to embed V3D content within a PDF file.
+
+commit 215f32fbf68ed4a2626e37a62552e2c0606744c9
+Author: John Bowman <bowman@ualberta.ca>
+Date: Wed Feb 21 00:49:39 2024 -0800
+
+ Delete trailing whitespace.
+
+commit 80d5e62455a2ad2a20b27acf66a141149f4c1a59
+Author: John Bowman <bowman@ualberta.ca>
+Date: Wed Feb 21 00:10:10 2024 -0800
+
+ Improve error messages and documentation.
+
+commit 542d92da66d913edc425dab33beb3c187cf419f9
+Merge: c60f3b51 c551fa24
+Author: John Bowman <bowman@ualberta.ca>
+Date: Sun Feb 18 23:50:08 2024 -0800
+
+ Merge branch 'master' into template.
+
+commit c551fa24a910dad4c456d8970f9a32ea1ebb632f
+Author: John Bowman <bowman@ualberta.ca>
+Date: Fri Feb 16 22:09:44 2024 -0800
+
+ Open context menu only for GUI-drawn items.
+
+commit c60f3b513670f266a33c55dd0e11255d1ebaac8d
+Author: John Bowman <bowman@ualberta.ca>
+Date: Mon Feb 12 21:24:21 2024 -0800
+
+ Rename index to sigHandle.
+
+commit b2c27b9c1a71b0b85b27624d33585dbd598810ed
+Author: John Bowman <bowman@ualberta.ca>
+Date: Mon Feb 12 21:11:37 2024 -0800
+
+ Implement and use mem::pair instead of std::pair for importIndex_t.
+
+commit 4c731ad2b18686a7e046529a1f3aa26c06cd99b4
+Author: Charles Staats III <charles.staats.iii@gmail.com>
+Date: Mon Feb 12 20:28:29 2024 -0800
+
+ Address some comments.
+
+commit 124722665617a004985dd3a59baaa41a49109611
+Merge: 167db8b8 d8fed60a
+Author: Charles Staats III <charles.staats.iii@gmail.com>
+Date: Mon Feb 12 19:43:53 2024 -0800
+
+ Merge branch 'master' of https://github.com/vectorgraphics/asymptote into template
+
+commit 167db8b845afd10640316d87b893e37ea0bc8617
+Author: Charles Staats III <charles.staats.iii@gmail.com>
+Date: Mon Feb 12 16:26:24 2024 -0800
+
+ No longer make typeParam copyable.
+
+commit be652a26a41501ccb7857d89993f67830302041c
+Author: Charles Staats III <charles.staats.iii@gmail.com>
+Date: Mon Feb 12 16:10:08 2024 -0800
+
+ deduplicate intSymbol and templatedSymbol lookup
+
+commit 8a87711cc92c4e0d40f24b7066c4c8c3ddb9df49
+Merge: 24c9d634 df776148
+Author: Charles Staats III <charles.staats.iii@gmail.com>
+Date: Mon Feb 12 13:09:32 2024 -0800
+
+ Merge branch 'templateVar' into template
+
+commit df77614820d4072a0070d6dbf5e84b84ce92d8e2
+Author: Charles Staats III <charles.staats.iii@gmail.com>
+Date: Mon Feb 12 13:05:16 2024 -0800
+
+ In debug mode, do not stop trying to parse template file at the first error.
+
+commit 24c9d6340f924bd13a6a2700edf61729c90d51f4
+Author: Charles Staats III <charles.staats.iii@gmail.com>
+Date: Mon Feb 12 09:52:17 2024 -0800
+
+ reword error message
+
+commit fa7da7c87ee397795becde4c3024ad7d7606d67f
+Author: Charles Staats III <charles.staats.iii@gmail.com>
+Date: Mon Feb 12 09:46:19 2024 -0800
+
+ Rename getType to getAbsyntaxType
+
+commit 363353f4c816c1828e6bb83634604e82c7509ee3
+Author: Charles Staats III <charles.staats.iii@gmail.com>
+Date: Mon Feb 12 09:24:58 2024 -0800
+
+ Use for(;;) rather than while(true) in C++ for consistency.
+
+commit 35c79ac9b513c39a42400b1a5646865b808ea284
+Author: Charles Staats III <charles.staats.iii@gmail.com>
+Date: Mon Feb 12 09:10:55 2024 -0800
+
+ checkpoint
+
+commit dca44de27ef3aad88bae6bf760938e060bb33dc6
+Author: Charles Staats III <charles.staats.iii@gmail.com>
+Date: Sun Feb 11 19:22:45 2024 -0800
+
+ Switch use of namedTyEntry to pointers
+
+commit 566207d2c701114b7b1a71813e7dc4ae69ca70da
+Author: Charles Staats III <charles.staats.iii@gmail.com>
+Date: Sun Feb 11 18:45:07 2024 -0800
+
+ Replace use of std::pair with a new gc-enabled struct.
+
+commit 1b9b8ed09b0315284d9cbea0da4dd3050e198623
+Merge: 8463465a 034891bd
+Author: Charles Staats III <charles.staats.iii@gmail.com>
+Date: Sun Feb 11 18:20:57 2024 -0800
+
+ Merge branch 'template' of https://github.com/vectorgraphics/asymptote into template
+
+commit 8463465a5f8c7e93f72d17e51649a3fee0793a8d
+Author: Charles Staats III <charles.staats.iii@gmail.com>
+Date: Sun Feb 11 18:20:27 2024 -0800
+
+ fix errors from previous commit
+
+commit 1c2b6dc6d0dbf517f53f48bb1ccd95c95f954969
+Author: Charles Staats III <charles.staats.iii@gmail.com>
+Date: Sun Feb 11 18:08:56 2024 -0800
+
+ Shorten lines longer than 79 columns.
+
+commit 034891bdb505ac9c7ee6c7a668c994110cb81ac3
+Author: John Bowman <bowman@ualberta.ca>
+Date: Sat Feb 10 08:56:33 2024 -0800
+
+ Ignore map.asy when building asy-keywords.el.
+
+commit e58211a522e856a4f93d2ff29da25c00db35feca
+Author: John Bowman <bowman@ualberta.ca>
+Date: Thu Jan 18 13:14:09 2024 -0800
+
+ Address issue #392.
+
+commit 91a5acbd6ac78ce44712cb486d5e97cf36077a24
+Author: John Bowman <bowman@ualberta.ca>
+Date: Thu Jan 18 12:46:41 2024 -0800
+
+ Fix issue #419: suppress duplicate error message.
+
+commit bec734026b6af2fe3724cbc3104df9076c07c5ae
+Author: Charles Staats III <charles.staats.iii@gmail.com>
+Date: Sat Feb 10 13:28:39 2024 -0800
+
+ Document templated imports
+
+commit 5c811376a71496c2325f31e5aab12eb0b2cc6f16
+Author: Charles Staats III <charles.staats.iii@gmail.com>
+Date: Sat Feb 10 13:28:26 2024 -0800
+
+ Add wrapperWithEquals.asy (left out of previous commit)
+
+commit d8fed60a48d98cd290b14cba614c8d30ad4743ee
+Author: John Bowman <bowman@ualberta.ca>
+Date: Sat Feb 10 08:56:33 2024 -0800
+
+ Ignore map.asy when building asy-keywords.el.
+
+commit 647b6c5732ec94a48f0f0b2446f02c86888fe7e7
+Author: Charles Staats III <charles.staats.iii@gmail.com>
+Date: Thu Feb 8 15:26:41 2024 -0800
+
+ Add TODO comments
+
+commit 9498f157a44bd9e96ffcefdde709da20110c2cca
+Author: Charles Staats III <charles.staats.iii@gmail.com>
+Date: Thu Feb 8 15:22:12 2024 -0800
+
+ tests with wrapper
+
+commit ee98d7193f93ace9ea168192ec32d31838e34025
+Author: Charles Staats III <charles.staats.iii@gmail.com>
+Date: Mon Feb 5 16:48:11 2024 -0800
+
+ template-based mapArray (with test but no doc yet)
+
+commit ea1f62e404b439528c4c25e390b7438bf4fb81cd
+Author: Charles Staats III <charles.staats.iii@gmail.com>
+Date: Sun Feb 4 16:39:34 2024 -0800
+
+ Add two tests for templates (one of which fails).
+
+commit 6c84defa29e4e48e55e39fc75aec83dd746c687f
+Author: Charles Staats III <charles.staats.iii@gmail.com>
+Date: Sun Jan 21 09:05:09 2024 -0800
+
+ More natural error from camp.y.
+
+commit 9810e8b2d175837fd86d2e9051f1b9ab0644b85d
+Author: Charles Staats III <charles.staats.iii@gmail.com>
+Date: Sat Jan 20 14:33:18 2024 -0800
+
+ Added errortest cases to incorrectly import correct template.
+
+commit c6e405563c4cabcb6343e483b5fa20824bd4de05
+Author: Charles Staats III <charles.staats.iii@gmail.com>
+Date: Sat Jan 20 14:18:00 2024 -0800
+
+ Catch 'typedef import' in wrong order; add test for this.
+
+commit b627a2f427402d528a96e505222fd09db847d1a7
+Author: Charles Staats III <charles.staats.iii@gmail.com>
+Date: Fri Jan 19 15:51:12 2024 -0800
+
+ Added some template-related tests to errortest.asy
+
+commit 484b430df6edc6d3f2410f840391b7b0172e1164
+Author: John Bowman <bowman@ualberta.ca>
+Date: Thu Jan 18 16:10:32 2024 -0800
+
+ Respect debug flag.
+
+commit dd702e6db7411b65e0265734b563bc56e634e04f
+Author: John Bowman <bowman@ualberta.ca>
+Date: Thu Jan 18 14:21:04 2024 -0800
+
+ Add missing semicolon.
+
+commit 45126f4b984492c90ca11a4a93346ce2fe135cbc
+Author: John Bowman <bowman@ualberta.ca>
+Date: Thu Jan 18 13:14:09 2024 -0800
+
+ Address issue #392.
+
+commit b96786e3014f6b3f0154e1ccb536cce823702965
+Author: John Bowman <bowman@ualberta.ca>
+Date: Thu Jan 18 12:46:41 2024 -0800
+
+ Fix issue #419: suppress duplicate error message.
+
+commit e7fc3aef8d0715408c95f0e2e6e4bb4da8ab71fb
+Author: Charles Staats III <charles.staats.iii@gmail.com>
+Date: Wed Jan 17 21:50:52 2024 -0800
+
+ better error message for positional template arg
+
+commit db40b20dd93c78a1441a4a7d6acd4a4b24888c7a
+Merge: d34926df 5650e015
+Author: Charles Staats III <charles.staats.iii@gmail.com>
+Date: Wed Jan 17 21:27:10 2024 -0800
+
+ Merge branch 'template' of https://github.com/vectorgraphics/asymptote into template
+
+commit 5650e0155f9b3411483dcc09dc72993f95768281
+Author: John Bowman <bowman@ualberta.ca>
+Date: Wed Jan 17 20:15:22 2024 -0800
+
+ Use a unique signature hash for identifying templated imports.
+
+commit d34926dfc945b03d1c1e8a950597ff2e8d18fa5e
+Merge: b5d3eb12 c66deaf2
+Author: Charles Staats III <charles.staats.iii@gmail.com>
+Date: Wed Jan 17 18:04:05 2024 -0800
+
+ Merge remote-tracking branch 'origin/template' into template
+
+commit b5d3eb1212ab52edbdc75395cb2ba07ac6cee989
+Author: Charles Staats III <charles.staats.iii@gmail.com>
+Date: Wed Jan 17 17:58:17 2024 -0800
+
+ Make 'from template access' work; a few changes regarding scopes and error handling
+
+commit c66deaf27e846314649f696418cd4cb6d6ba977b
+Author: John Bowman <bowman@ualberta.ca>
+Date: Wed Jan 17 17:36:17 2024 -0800
+
+ Don't process templated imports with mismatched parameters.
+
+commit 492506c6009829ef64f738f0ed287c4042865fed
+Author: Charles Staats III <charles.staats.iii@gmail.com>
+Date: Wed Jan 17 14:57:11 2024 -0800
+
+ checkpoint; extraneous errors fixed?
+
+commit 50961c069288547c1ca3431a225b274ad34154f2
+Merge: 3f55d6eb dd4b63cc
+Author: Charles Staats III <charles.staats.iii@gmail.com>
+Date: Tue Jan 16 18:52:03 2024 -0800
+
+ Merge branch 'master' into template
+ Incorporate fix to "from module access (type & method)".
+
+commit 3f55d6eba90de078fcdcd1b314a251c5aff48df2
+Author: Charles Staats III <charles.staats.iii@gmail.com>
+Date: Tue Jan 16 18:38:13 2024 -0800
+
+ checkpoint
+
+commit dd4b63cc1f7cf0c9bdb716db9963b4a0de8e7d27
+Author: John Bowman <bowman@ualberta.ca>
+Date: Tue Jan 16 17:27:00 2024 -0800
+
+ Suppress warning message regarding boolean operator.
+
+commit 8652763972c48b7675d7a8707499311c1d1a5030
+Author: John Bowman <bowman@ualberta.ca>
+Date: Tue Jan 16 17:23:33 2024 -0800
+
+ Revert "Fix boolean operator."
+
+ This reverts commit fffdb62031f4f68007b2721bdd8ef86ef37d8e3d.
+
+commit 23ab319cc4d6a9b2c58ded0e44201a49744031c5
+Author: John Bowman <bowman@ualberta.ca>
+Date: Mon Jan 15 20:29:12 2024 -0800
+
+ Use signature hash for indexing templated imports.
+
+commit 386da6bf46d8f05ba51425a66814dcd2bda0cd65
+Author: Charles Staats III <charles.staats.iii@gmail.com>
+Date: Mon Jan 15 19:24:05 2024 -0800
+
+ Seemingly working template declaration for the module to receive template parameters.
+
+commit 40d262ade847a245fe844733bd55f865d3e55556
+Author: Charles Staats III <charles.staats.iii@gmail.com>
+Date: Mon Jan 15 16:11:37 2024 -0800
+
+ Syntax to receive template params or supply header
+
+commit 6f04389e02b8eae711f200d942b15a05c42b38c1
+Author: Charles Staats III <charles.staats.iii@gmail.com>
+Date: Mon Jan 15 14:43:40 2024 -0800
+
+ Move 'add symbol' logic closer to module execution
+
+commit 3339ac1fe6ac80d4bb3f56c11b3bdd753275b934
+Author: John Bowman <bowman@ualberta.ca>
+Date: Sun Jan 14 23:57:41 2024 -0800
+
+ Allow multiple templated imports.
+
+commit 74ae11c4ff563a9ecc43f39f332f4399c939a44e
+Author: Charles Staats III <charles.staats.iii@gmail.com>
+Date: Sun Jan 14 13:47:05 2024 -0800
+
+ Template params are used on the first import only
+
+commit 4afba32597347b225164d284f2985e62c350dcba
+Author: Charles Staats III <charles.staats.iii@gmail.com>
+Date: Sat Jan 13 16:03:37 2024 -0800
+
+ Notation parses but always maps T to pair.
+
+commit 0c7fa4112d7ba8eb61ac0b3d83820136fc649af9
+Author: Charles Staats III <charles.staats.iii@gmail.com>
+Date: Sat Jan 13 15:41:25 2024 -0800
+
+ checkpoint
+
+commit 82c24dc684f7250a5e9a290e4459537ee1edc628
+Author: Charles Staats III <charles.staats.iii@gmail.com>
+Date: Thu Jan 11 14:32:16 2024 -0800
+
+ checkpoint
+
+commit 272274b2474264a1f6ba4fa84d6fb94305d71500
+Author: John Bowman <bowman@ualberta.ca>
+Date: Mon Jan 8 17:56:46 2024 -0800
+
+ Update fftw++.h and seconds.h.
+
+commit aa1cb4d1084c2eb54fccb89e1626d3340e948568
+Author: Charles Staats III <charles.staats.iii@gmail.com>
+Date: Mon Jan 8 14:35:52 2024 -0800
+
+ checkpoint
+
+commit df359f5d9a382f48caef4c0dc22c67165a7e182e
+Author: Charles Staats III <charles.staats.iii@gmail.com>
+Date: Thu Jan 4 15:47:18 2024 -0800
+
+ translate decdec to formal
+
+commit a9850d7d94a2b65ad3c38d1607d5d3850242a050
+Author: Charles Staats III <charles.staats.iii@gmail.com>
+Date: Fri Dec 29 10:12:33 2023 -0800
+
+ dummy parse from Andy
+
+commit 98d66af9f0a7d942ffcf81a21d2d6aa9961bf12d
+Author: John Bowman <bowman@ualberta.ca>
+Date: Tue Jan 2 17:06:05 2024 -0800
+
+ Improve diagnostic.
+
+commit 8c83a8e8710f245bab9833850fd8381c612ea1b9
+Author: John Bowman <bowman@ualberta.ca>
+Date: Mon Jan 1 13:17:56 2024 -0800
+
+ Address issue #410: Support latexmk --output-directory.
+
+commit 112654bcf832c49ef7b24df4fe0c55d7362174cc
+Author: John Bowman <bowman@ualberta.ca>
+Date: Sun Dec 31 22:20:22 2023 -0800
+
+ Fix issue #414: restore missing outpath.
+
+commit 4f4a3276fce7dab6b4ee2199fc90157fe91f9d92
+Author: John Bowman <bowman@ualberta.ca>
+Date: Sun Dec 31 06:56:58 2023 -0800
+
+ Fix issue #412: prevent inferred assignment of void type.
+
+commit 8428d007fb9ea47f9531c679acf6bd8f58dcbba5
+Author: John Bowman <bowman@ualberta.ca>
+Date: Thu Dec 28 23:55:02 2023 -0800
+
+ Fix typo (issue #411).
+
+commit 2b4140b09ecf2df7312f93c59dff128b1a39c222
+Author: John Bowman <bowman@ualberta.ca>
+Date: Wed Dec 20 00:10:13 2023 -0800
+
+ Fix outname.
+
+commit f25a3a9627adb94eef4d1fbe1c97c4702d8d282f
+Author: John Bowman <bowman@ualberta.ca>
+Date: Tue Dec 19 23:45:03 2023 -0800
+
+ Fix bug #373: avoid repeated stripping of file extensions.
+
+commit 3cc421585211a3a55bc9ca90e3eab5db8ee18508
+Author: John Bowman <bowman@ualberta.ca>
+Date: Tue Dec 19 23:14:21 2023 -0800
+
+ Only output v3d format for 3D files.
+
+commit 35c261216d6e45593ccd13155ca0ab31652adaf6
+Author: John Bowman <bowman@ualberta.ca>
+Date: Tue Dec 19 19:20:56 2023 -0800
+
+ git subrepo pull --force LspCpp
+
+ subrepo:
+ subdir: "LspCpp"
+ merged: "1f397e56"
+ upstream:
+ origin: "git@github.com:vectorgraphics/LspCpp"
+ branch: "master"
+ commit: "1f397e56"
+ git-subrepo:
+ version: "0.4.6"
+ origin: "???"
+ commit: "???"
+
+commit 081db9d0865403a5d82a749e58f035479193ca8a
+Author: John Bowman <bowman@ualberta.ca>
+Date: Tue Dec 19 19:17:52 2023 -0800
+
+ Fix LSP segmentation fault.
+
+commit 488d80962c76cc60629f590e34b350459ea59621
+Author: John Bowman <bowman@ualberta.ca>
+Date: Mon Dec 18 22:33:47 2023 -0800
+
+ Fix bug #405: implicitly format integers with full precision.
+
+commit 6868ca1a66611d72f716e57617d1c9c6031d3fe7
+Author: Supakorn 'Jamie' Rassameemasmuang <jamievlin@outlook.com>
+Date: Sat Dec 9 00:00:49 2023 -0700
+
+ Add LSPCPP_USEGC macro flag in case of gc.
+
+commit 4f0b79391800424a729ccd393f31d01cbb86bbb4
+Author: John Bowman <bowman@ualberta.ca>
+Date: Sat Nov 18 19:38:00 2023 -0800
+
+ Fix fitscreen.
+
+commit fb0c259606b8323e8b5d223f2fe66a485fbe17ac
+Author: John Bowman <bowman@ualberta.ca>
+Date: Sat Nov 18 16:21:56 2023 -0800
+
+ Fix warning message.
+
+commit 1007bd5d1e92e9d41577cf28f1d81fbd3de04fbf
+Author: John Bowman <bowman@ualberta.ca>
+Date: Sat Nov 18 12:29:00 2023 -0800
+
+ Remove unused include.
+
+commit b6e9a2c4ab8d06720bd28930b0c12589d7da19d5
+Author: John Bowman <bowman@ualberta.ca>
+Date: Wed Nov 15 15:42:37 2023 -0800
+
+ Fix URL.
+
+commit b706a4fd6718e1aa1b3ce06ca657b60fc54ea4c2
+Author: John Bowman <bowman@ualberta.ca>
+Date: Mon Nov 6 23:44:14 2023 -0800
+
+ Implement mapArray via mapArrayString.
+
+commit e991c19bbb4318201be9e6d8fa11e58ff93c1183
+Author: John Bowman <bowman@ualberta.ca>
+Date: Fri Nov 3 23:49:52 2023 -0700
+
+ git subrepo pull (merge) --force LspCpp
+
+ subrepo:
+ subdir: "LspCpp"
+ merged: "3bd6c6dc"
+ upstream:
+ origin: "git@github.com:vectorgraphics/LspCpp"
+ branch: "master"
+ commit: "3bd6c6dc"
+ git-subrepo:
+ version: "0.4.6"
+ origin: "???"
+ commit: "???"
+
+commit 97af5c4c4d318c8c8642bf596506b79936312c36
+Author: John Bowman <bowman@ualberta.ca>
+Date: Fri Nov 3 23:42:04 2023 -0700
+
+ git subrepo pull --force LspCpp
+
+ subrepo:
+ subdir: "LspCpp"
+ merged: "5f4a5990"
+ upstream:
+ origin: "git@github.com:vectorgraphics/LspCpp"
+ branch: "master"
+ commit: "5f4a5990"
+ git-subrepo:
+ version: "0.4.6"
+ origin: "???"
+ commit: "???"
+
+commit 2cb894653a74235788ce33575f9a1af1ea15796b
+Author: John Bowman <bowman@ualberta.ca>
+Date: Tue Oct 10 23:14:04 2023 -0700
+
+ Fix SVG gradient shading offsets (issue #389).
+
+commit 75b1ffb846ef59051875147460815f6fab9dfad3
+Author: John Bowman <bowman@ualberta.ca>
+Date: Mon Oct 9 23:50:57 2023 -0700
+
+ Fix issue #391: Workaround libc++ parsing bug under MacOS.
+
+commit 87195dbbf5fd698d7e07a148ff44473336fa141c
+Author: John Bowman <bowman@ualberta.ca>
+Date: Mon Oct 2 22:58:36 2023 -0700
+
+ Simplify bilinear interpolation of surfaces.
+
+commit cc79cc5253f4e9963c731f131ea00a3fea6cbc29
+Merge: 90bc314c 25be300d
+Author: Supakorn 'Jamie' Rassameemasmuang <jamievlin@outlook.com>
+Date: Mon Sep 25 16:12:50 2023 -0600
+
+ Merge pull request #390 from vectorgraphics/gitattribs
+
+ Add .gitattributes file to help with windows/wsl build process.
+
+commit 90bc314c26833477c871adcebc817ef911190b91
+Author: John Bowman <bowman@ualberta.ca>
+Date: Sun Sep 24 10:22:36 2023 -0700
+
+ Simplify examples.
+
+commit fa97fc830a6f76c8da820981ca7728e54b76f1db
+Author: John Bowman <bowman@ualberta.ca>
+Date: Sat Sep 23 20:48:06 2023 -0700
+
+ Fix documentation of shipout (issue #396).
+
+commit 25be300d82227d14b5671241c3b9819c1a874f6e
+Author: Supakorn Rassameemasmuang <jamievlin@outlook.com>
+Date: Wed Aug 9 11:36:44 2023 -0600
+
+ Add .gitattributes file to help with windows/wsl build process.
+
+commit aa9f81bad9478bfe8b2ab5fc5376c19c6c79c708
+Author: John Bowman <bowman@ualberta.ca>
+Date: Sat Jul 29 23:25:54 2023 -0600
+
+ Fix bug 388: Avoid broken dvisvgm reassign-clippaths optimization.
+
+commit b069d8158e7921298b38874b4b2600de0fddf497
+Merge: 29caaed5 2a242c54
+Author: John Bowman <bowman@ualberta.ca>
+Date: Tue Jun 27 16:31:53 2023 -0600
+
+ Merge pull request #383 from cyrilled76/patch-1
+
+ Fix doc
+
+commit 2a242c545a7c6bf8dc59bcb0bce4cbf66ba8695e
+Author: cyrilled76 <122608369+cyrilled76@users.noreply.github.com>
+Date: Tue Jun 27 22:52:30 2023 +0200
+
+ Fix doc
+
+commit 29caaed5ead5a62787475286afd22e40585b8bb8
+Author: John Bowman <bowman@ualberta.ca>
+Date: Wed Jun 14 22:36:35 2023 -0600
+
+ Fix --without-lsp (issue #379).
+
+commit e9e376538bf3899cd3dbd4ed9bd77ae04460baa9
+Author: John Bowman <bowman@ualberta.ca>
+Date: Mon Jun 12 18:25:15 2023 -0600
+
+ Increment version to 2.87.
+
+commit 6c49014d0055d9dfdeb5dca5fb23a37a3ce1c9e3
+Author: John Bowman <bowman@ualberta.ca>
+Date: Tue Jun 6 22:12:03 2023 -0600
+
+ Update HOWTO.
+
+commit 4d5224cf59d75f08c7360382bf7e7c12167ce35f
+Author: John Bowman <bowman@ualberta.ca>
+Date: Tue Jun 6 19:59:30 2023 -0600
+
+ Update build script.
+
+commit 3c359d89cc4bfba685d5c29794af934e08c5329f
+Author: John Bowman <bowman@ualberta.ca>
+Date: Tue Jun 6 17:15:36 2023 -0600
+
+ Fix type.
+
+commit 0104aea26bf8f76dc15f717a5ea78e0ff46b659f
+Author: John Bowman <bowman@ualberta.ca>
+Date: Tue Jun 6 16:26:53 2023 -0600
+
+ Fix compilation under MSDOS.
+
+commit 13fac7197d9f62f890f3c78d40eda8f5b819c99c
+Author: John Bowman <bowman@ualberta.ca>
+Date: Tue Jun 6 00:17:26 2023 -0600
+
+ Fix boost issues.
+
+commit fbe3f431adc74ff6ac307fd4868da8f8b363efaa
+Author: John Bowman <bowman@ualberta.ca>
+Date: Tue Jun 6 00:00:47 2023 -0600
+
+ git subrepo pull --force LspCpp
+
+ subrepo:
+ subdir: "LspCpp"
+ merged: "9b0d99d1"
+ upstream:
+ origin: "git@github.com:vectorgraphics/LspCpp"
+ branch: "master"
+ commit: "9b0d99d1"
+ git-subrepo:
+ version: "0.4.6"
+ origin: "???"
+ commit: "???"
+
+commit 728e00fa9dcc9d13f9fa5da82c2f901420485c61
+Author: John Bowman <bowman@ualberta.ca>
+Date: Mon Jun 5 22:47:35 2023 -0600
+
+ Fix std::optional compilation issues.
+
+commit c18c01677cfbeb3d956633df86a79e984a8f8255
+Author: John Bowman <bowman@ualberta.ca>
+Date: Mon Jun 5 22:47:05 2023 -0600
+
+ git subrepo pull --force LspCpp
+
+ subrepo:
+ subdir: "LspCpp"
+ merged: "1a04514e"
+ upstream:
+ origin: "git@github.com:vectorgraphics/LspCpp"
+ branch: "master"
+ commit: "1a04514e"
+ git-subrepo:
+ version: "0.4.6"
+ origin: "???"
+ commit: "???"
+
+commit b24fba5df113d4a5e7af41d01011b912916b2a06
+Author: John Bowman <bowman@ualberta.ca>
+Date: Mon Jun 5 01:36:17 2023 -0600
+
+ git subrepo pull --force LspCpp
+
+ subrepo:
+ subdir: "LspCpp"
+ merged: "97ccf8e9"
+ upstream:
+ origin: "git@github.com:vectorgraphics/LspCpp"
+ branch: "master"
+ commit: "97ccf8e9"
+ git-subrepo:
+ version: "0.4.6"
+ origin: "???"
+ commit: "???"
+
+commit 346ec934bd279beaf1d1605d657fd8e15378022b
+Author: John Bowman <bowman@ualberta.ca>
+Date: Mon Jun 5 01:10:41 2023 -0600
+
+ Work around unavailable clock_gettime under old versions of MacOS.
+
+commit 1d7caee225a5fe892c9ba2f7ffff1e63335352fa
+Author: John Bowman <bowman@ualberta.ca>
+Date: Mon Jun 5 01:10:06 2023 -0600
+
+ Fix portability issue with GLSL_VERSION.
+
+commit e49ed605f0e13ff75ae21f5b653f3c4b319a33f6
+Author: John Bowman <bowman@ualberta.ca>
+Date: Sun Jun 4 22:49:48 2023 -0600
+
+ Initialize spin counter; remove remaining gettimeofday calls.
+
+commit 59bb7930b9a08c530f66957c5c60f64b07a59374
+Author: John Bowman <bowman@ualberta.ca>
+Date: Sun Jun 4 15:53:40 2023 -0600
+
+ Update Boehm GC to 8.2.4.
+
+commit 4080bee015b099acd933bf40a89d2933c1edbdc2
+Author: John Bowman <bowman@ualberta.ca>
+Date: Sun Jun 4 11:58:51 2023 -0600
+
+ git subrepo pull --force LspCpp
+
+ subrepo:
+ subdir: "LspCpp"
+ merged: "018aaca5"
+ upstream:
+ origin: "git@github.com:vectorgraphics/LspCpp"
+ branch: "master"
+ commit: "018aaca5"
+ git-subrepo:
+ version: "0.4.6"
+ origin: "???"
+ commit: "???"
+
+commit 267922a9d8d7f9077d6d5bd7260e176cf200d010
+Author: John Bowman <bowman@ualberta.ca>
+Date: Sun Jun 4 11:36:51 2023 -0600
+
+ git subrepo pull --force LspCpp
+
+ subrepo:
+ subdir: "LspCpp"
+ merged: "6874d444"
+ upstream:
+ origin: "git@github.com:vectorgraphics/LspCpp"
+ branch: "master"
+ commit: "6874d444"
+ git-subrepo:
+ version: "0.4.6"
+ origin: "???"
+ commit: "???"
+
+commit 2d541360013d7357be3258c1ba6ea7ed98ae1e45
+Author: John Bowman <bowman@ualberta.ca>
+Date: Sun Jun 4 11:35:18 2023 -0600
+
+ git subrepo pull --force LspCpp
+
+ subrepo:
+ subdir: "LspCpp"
+ merged: "530bd22e"
+ upstream:
+ origin: "git@github.com:vectorgraphics/LspCpp"
+ branch: "master"
+ commit: "530bd22e"
+ git-subrepo:
+ version: "0.4.6"
+ origin: "???"
+ commit: "???"
+
+commit bd3813ca7592cc3dba43fa4007ff4f129d668f24
+Author: John Bowman <bowman@ualberta.ca>
+Date: Sun Jun 4 10:52:31 2023 -0600
+
+ git subrepo pull --force LspCpp
+
+ subrepo:
+ subdir: "LspCpp"
+ merged: "6c723f47"
+ upstream:
+ origin: "git@github.com:vectorgraphics/LspCpp"
+ branch: "master"
+ commit: "6c723f47"
+ git-subrepo:
+ version: "0.4.6"
+ origin: "???"
+ commit: "???"
+
+commit a3f45abc54caf855167b662ffd3717e2ab733289
+Author: John Bowman <bowman@ualberta.ca>
+Date: Sun Jun 4 10:51:34 2023 -0600
+
+ Revert "Revert "Change boost::optional to std::optional"."
+
+ This reverts commit d6ddd54262b7bf61830572988e2f4bd953802a28.
+
+commit 6cb475a540d695b3fcee20252e2ffac2c8f1adb5
+Author: John Bowman <bowman@ualberta.ca>
+Date: Sat Jun 3 15:06:24 2023 -0600
+
+ git subrepo pull (merge) LspCpp
+
+ subrepo:
+ subdir: "LspCpp"
+ merged: "acde1180"
+ upstream:
+ origin: "git@github.com:vectorgraphics/LspCpp"
+ branch: "master"
+ commit: "936b427d"
+ git-subrepo:
+ version: "0.4.6"
+ origin: "???"
+ commit: "???"
+
+commit d6ddd54262b7bf61830572988e2f4bd953802a28
+Author: John Bowman <bowman@ualberta.ca>
+Date: Sat Jun 3 14:55:20 2023 -0600
+
+ Revert "Change boost::optional to std::optional".
+
+ This reverts commit 0de3cfdb930d53d9ea2c03674e8ab228bf31b0d1.
+
+commit 5a4f72184e494aafaf5298b0b51f7338d7fb97f0
+Author: John Bowman <bowman@ualberta.ca>
+Date: Sat Jun 3 14:42:17 2023 -0600
+
+ git subrepo pull --force LspCpp
+
+ subrepo:
+ subdir: "LspCpp"
+ merged: "f96a1ac0"
+ upstream:
+ origin: "git@github.com:vectorgraphics/LspCpp"
+ branch: "master"
+ commit: "f96a1ac0"
+ git-subrepo:
+ version: "0.4.6"
+ origin: "???"
+ commit: "???"
+
+commit b3345619ab5aad88fcf229591c5a20f0d0864eaa
+Merge: 5c40136f 7366fe26
+Author: John Bowman <bowman@ualberta.ca>
+Date: Sat Jun 3 12:21:01 2023 -0600
+
+ Merge pull request #356 from yarusome/master
+
+ Fixing bugs in the inversion section of the `geometry` module
+
+commit 5c40136f60cbeab6924626085c68cc161d0dae45
+Author: John Bowman <bowman@ualberta.ca>
+Date: Sat Jun 3 12:11:23 2023 -0600
+
+ Reformat code.
+
+commit 4709f6e6956d3f455c127fa5d44debf6f70d027e
+Merge: 456ae992 7f5cdf0b
+Author: John Bowman <bowman@ualberta.ca>
+Date: Sat Jun 3 11:59:50 2023 -0600
+
+ Merge pull request #377 from LemonBoy/fix-io-read
+
+ io: Fix reading of NaN and inf values
+
+commit 456ae99203a291f9c50128ec55965ad948e11971
+Author: John Bowman <bowman@ualberta.ca>
+Date: Fri Jun 2 21:42:12 2023 -0600
+
+ Remove lsp option when disabled.
+
+commit 214b8969a66af0dde0168ac17e2a343debb7d047
+Author: John Bowman <bowman@ualberta.ca>
+Date: Mon May 29 10:33:28 2023 -0600
+
+ Remove unused cast.
+
+commit 7f5cdf0b2c6aed2e26ff7310aa3d181419a6eea8
+Author: LemonBoy <thatlemon@gmail.com>
+Date: Sun May 28 19:09:57 2023 +0200
+
+ io: Fix reading of NaN and inf values
+
+ Previously asymptote would silently stop while trying to read a textual
+ dataset containing inf or nan values, while the language itself is
+ perfectly capable of handling such values.
+
+commit 43cf506b5bce0957205650246c8616b97e143133
+Author: John Bowman <bowman@ualberta.ca>
+Date: Sun May 14 13:54:15 2023 -0600
+
+ Remove unused variables.
+
+commit 494e8120ee967aa9c71ae26e2476b5632211b6e2
+Author: John Bowman <bowman@ualberta.ca>
+Date: Mon Apr 17 21:23:57 2023 -0600
+
+ Fix compilation when configured with --disable-gl.
+
+commit 4715fea108852e25cd38a6a74079985f5fe91e7f
+Author: John Bowman <bowman@ualberta.ca>
+Date: Sat Apr 15 16:31:59 2023 -0600
+
+ Suppress .setblendmode for EPS output.
+
+commit 700aaec3a6d1fd3a78f04537a61bad82a5f07057
+Author: John Bowman <bowman@ualberta.ca>
+Date: Sun Mar 12 00:03:46 2023 -0700
+
+ Fix portability issues.
+
+commit fffdb62031f4f68007b2721bdd8ef86ef37d8e3d
+Author: John Bowman <bowman@ualberta.ca>
+Date: Sat Mar 11 23:42:20 2023 -0700
+
+ Fix boolean operator.
+
+commit da81bd59f89ba8be1131243f680f06ed57fee571
+Author: John Bowman <bowman@ualberta.ca>
+Date: Sat Mar 11 23:33:28 2023 -0700
+
+ Update config.guess.
+
+commit 65165fe1528692980fd52c7f1c3735c7ac5bd2c0
+Author: John Bowman <bowman@ualberta.ca>
+Date: Sun Mar 5 20:48:00 2023 -0700
+
+ Fix bug #370: automatically apply PDF transfer functions.
+
+commit 11c8cc57a4b66e5f04f3ab2f1cfd6f33d2c8d43d
+Author: John Bowman <bowman@ualberta.ca>
+Date: Mon Feb 20 13:41:10 2023 -0700
+
+ Clear initial index buffer.
+
+commit 7623f325b1a370851db9559a5a058e552b71a2f6
+Author: John Bowman <bowman@ualberta.ca>
+Date: Sun Feb 19 01:32:10 2023 -0700
+
+ Fix last revision.
+
+commit 0a248a219e44d2945bcc31c5424153ec1ace41bb
+Author: John Bowman <bowman@ualberta.ca>
+Date: Sun Feb 19 01:28:30 2023 -0700
+
+ Only output unscaled primitives.
+
+commit e8e88fb4412ce92acf222ceafe18e3be26984b90
+Author: John Bowman <bowman@ualberta.ca>
+Date: Wed Feb 8 23:39:44 2023 -0700
+
+ Increment version to 2.86.
+
commit 9e242d4e7d6d79656c09d4f6c7c385dd7ea61bb3
Author: John Bowman <bowman@ualberta.ca>
Date: Wed Feb 8 21:30:27 2023 -0700
@@ -166,6 +1174,12 @@ Date: Sun Jan 22 22:06:10 2023 -0700
Increment version to 2.85.
+commit 7366fe26314370241c949921389492a4cb862f33
+Author: yarusome <97945148+yarusome@users.noreply.github.com>
+Date: Mon Jan 23 12:15:54 2023 +0800
+
+ Fixing the use of `inverse()`
+
commit 430c7a661c060568720f6d65e611a2087ea1dde6
Author: John Bowman <bowman@ualberta.ca>
Date: Sat Jan 21 22:48:26 2023 -0700
@@ -218,6 +1232,22 @@ Date: Mon Dec 12 22:19:03 2022 -0700
Avoid division by zero.
+commit 58af9b461ff373ec32e6d1db869c80cf3b6dd137
+Author: yarusome <97945148+yarusome@users.noreply.github.com>
+Date: Sun Dec 11 13:59:36 2022 +0800
+
+ Simplifying the internal use of `inversion`
+
+ This commit replaces `(real, point, ...)` with `(inversion, ...)` in the parameter list of internally-used functions in the inversion section, and simplifies the initializer definitions of `inversion` using `operator init`.
+
+commit 1fcc742a8e372b8280e92573a31542ed3cdc9117
+Author: yarusome <97945148+yarusome@users.noreply.github.com>
+Date: Sun Dec 11 13:19:55 2022 +0800
+
+ Fixing the inversion section of the `geometry` module
+
+ This commit fixes bugs related to coordinate systems in the inversion section, and all the returned `point`s are in `currentcoordsys` now.
+
commit 46d6ea7351699bbed0418ec6d7f2195011178e5a
Author: John Bowman <bowman@ualberta.ca>
Date: Mon Nov 28 20:20:35 2022 -0700
diff --git a/Build/source/utils/asymptote/GUI/Window1.py b/Build/source/utils/asymptote/GUI/Window1.py
index bae034a15c1..1e65b23597f 100644
--- a/Build/source/utils/asymptote/GUI/Window1.py
+++ b/Build/source/utils/asymptote/GUI/Window1.py
@@ -2460,9 +2460,10 @@ class MainWindow1(Qw.QMainWindow):
except:
return
- if self.fileItems[maj] is not None:
- self.contextWindowObject = self.fileItems[maj] #For arrowifying
- self.contextWindow = ContextWindow.AnotherWindow(self.fileItems[maj],self)
+ item=self.fileItems[maj]
+ if item is not None and isinstance(item, x2a.xasyDrawnItem):
+ self.contextWindowObject = item #For arrowifying
+ self.contextWindow = ContextWindow.AnotherWindow(item,self)
self.contextWindow.setMinimumWidth(420)
#self.setCentralWidget(self.contextWindow) #I don't know what this does tbh.
self.contextWindow.show()
diff --git a/Build/source/utils/asymptote/GUI/icons_rc.py b/Build/source/utils/asymptote/GUI/icons_rc.py
index 7a59d361a53..0c037244cc2 100644
--- a/Build/source/utils/asymptote/GUI/icons_rc.py
+++ b/Build/source/utils/asymptote/GUI/icons_rc.py
@@ -2,14 +2,14 @@
# Resource object code
#
-# Created by: The Resource Compiler for PyQt5 (Qt v5.15.8)
+# Created by: The Resource Compiler for PyQt5 (Qt v5.15.11)
#
# WARNING! All changes made in this file will be lost!
from PyQt5 import QtCore
qt_resource_data = b"\
-\x00\x00\x02\xf0\
+\x00\x00\x05\xbb\
\x3c\
\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
@@ -40,66 +40,69 @@ qt_resource_data = b"\
\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3d\x22\x6e\x65\
\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x78\
\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\x72\
-\x76\x65\x22\x3e\x0a\x3c\x67\x20\x69\x64\x3d\x22\x49\x63\x6f\x6e\
-\x5f\x32\x30\x5f\x22\x3e\x0a\x09\x3c\x67\x3e\x0a\x09\x09\x3c\x70\
-\x61\x74\x68\x20\x64\x3d\x22\x4d\x32\x35\x36\x2c\x34\x38\x43\x31\
-\x34\x31\x2e\x36\x30\x31\x2c\x34\x38\x2c\x34\x38\x2c\x31\x34\x31\
-\x2e\x36\x30\x31\x2c\x34\x38\x2c\x32\x35\x36\x73\x39\x33\x2e\x36\
-\x30\x31\x2c\x32\x30\x38\x2c\x32\x30\x38\x2c\x32\x30\x38\x73\x32\
-\x30\x38\x2d\x39\x33\x2e\x36\x30\x31\x2c\x32\x30\x38\x2d\x32\x30\
-\x38\x53\x33\x37\x30\x2e\x33\x39\x39\x2c\x34\x38\x2c\x32\x35\x36\
-\x2c\x34\x38\x7a\x20\x4d\x32\x35\x36\x2c\x34\x32\x32\x2e\x33\x39\
-\x39\x0a\x09\x09\x09\x63\x2d\x39\x31\x2e\x35\x31\x38\x2c\x30\x2d\
-\x31\x36\x36\x2e\x33\x39\x39\x2d\x37\x34\x2e\x38\x38\x32\x2d\x31\
-\x36\x36\x2e\x33\x39\x39\x2d\x31\x36\x36\x2e\x33\x39\x39\x53\x31\
-\x36\x34\x2e\x34\x38\x32\x2c\x38\x39\x2e\x36\x2c\x32\x35\x36\x2c\
-\x38\x39\x2e\x36\x53\x34\x32\x32\x2e\x34\x2c\x31\x36\x34\x2e\x34\
-\x38\x32\x2c\x34\x32\x32\x2e\x34\x2c\x32\x35\x36\x53\x33\x34\x37\
-\x2e\x35\x31\x38\x2c\x34\x32\x32\x2e\x33\x39\x39\x2c\x32\x35\x36\
-\x2c\x34\x32\x32\x2e\x33\x39\x39\x7a\x22\x2f\x3e\x0a\x09\x3c\x2f\
-\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\
-\x00\x00\x02\x77\
-\x3c\
-\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
-\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
-\x2d\x38\x22\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\x72\
-\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\x20\x49\x6c\x6c\x75\
-\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x36\x2e\x32\x2e\x31\x2c\x20\
-\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\x50\x6c\x75\x67\x2d\
-\x49\x6e\x20\x2e\x20\x53\x56\x47\x20\x56\x65\x72\x73\x69\x6f\x6e\
-\x3a\x20\x36\x2e\x30\x30\x20\x42\x75\x69\x6c\x64\x20\x30\x29\x20\
-\x20\x2d\x2d\x3e\x0a\x3c\x21\x44\x4f\x43\x54\x59\x50\x45\x20\x73\
-\x76\x67\x20\x50\x55\x42\x4c\x49\x43\x20\x22\x2d\x2f\x2f\x57\x33\
-\x43\x2f\x2f\x44\x54\x44\x20\x53\x56\x47\x20\x31\x2e\x31\x2f\x2f\
-\x45\x4e\x22\x20\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\
-\x77\x33\x2e\x6f\x72\x67\x2f\x47\x72\x61\x70\x68\x69\x63\x73\x2f\
-\x53\x56\x47\x2f\x31\x2e\x31\x2f\x44\x54\x44\x2f\x73\x76\x67\x31\
-\x31\x2e\x64\x74\x64\x22\x3e\x0a\x3c\x73\x76\x67\x20\x76\x65\x72\
-\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\x3d\x22\x4c\
-\x61\x79\x65\x72\x5f\x31\x22\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\
-\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\
-\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\x6e\x73\
-\x3a\x78\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\
-\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\x78\
-\x6c\x69\x6e\x6b\x22\x20\x78\x3d\x22\x30\x70\x78\x22\x20\x79\x3d\
-\x22\x30\x70\x78\x22\x0a\x09\x20\x77\x69\x64\x74\x68\x3d\x22\x35\
-\x31\x32\x70\x78\x22\x20\x68\x65\x69\x67\x68\x74\x3d\x22\x35\x31\
-\x32\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\x20\
-\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x73\x74\x79\x6c\x65\
-\x3d\x22\x65\x6e\x61\x62\x6c\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\
-\x75\x6e\x64\x3a\x6e\x65\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\
-\x35\x31\x32\x3b\x22\x20\x78\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\
-\x22\x70\x72\x65\x73\x65\x72\x76\x65\x22\x3e\x0a\x3c\x70\x6f\x6c\
-\x79\x67\x6f\x6e\x20\x70\x6f\x69\x6e\x74\x73\x3d\x22\x32\x38\x38\
-\x2c\x39\x36\x20\x33\x33\x37\x2e\x39\x2c\x31\x34\x35\x2e\x39\x20\
-\x32\x37\x34\x2c\x32\x30\x39\x2e\x37\x20\x32\x37\x34\x2c\x32\x30\
-\x39\x2e\x37\x20\x31\x34\x35\x2e\x39\x2c\x33\x33\x37\x2e\x39\x20\
-\x39\x36\x2c\x32\x38\x38\x20\x39\x36\x2c\x34\x31\x36\x20\x32\x32\
-\x34\x2c\x34\x31\x36\x20\x31\x37\x34\x2e\x31\x2c\x33\x36\x36\x2e\
-\x31\x20\x33\x35\x37\x2e\x34\x2c\x31\x38\x32\x2e\x39\x20\x33\x36\
-\x36\x2e\x31\x2c\x31\x37\x34\x2e\x31\x20\x0a\x09\x34\x31\x36\x2c\
-\x32\x32\x34\x20\x34\x31\x36\x2c\x39\x36\x20\x22\x2f\x3e\x0a\x3c\
-\x2f\x73\x76\x67\x3e\x0a\
+\x76\x65\x22\x3e\x0a\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x34\
+\x35\x30\x2e\x36\x37\x39\x2c\x32\x37\x33\x2e\x35\x63\x2d\x31\x34\
+\x2e\x35\x38\x35\x2d\x31\x34\x2e\x35\x37\x37\x2d\x33\x36\x2e\x30\
+\x35\x34\x2d\x31\x35\x2e\x38\x39\x2d\x35\x30\x2e\x36\x33\x39\x2d\
+\x31\x2e\x33\x31\x32\x6c\x2d\x34\x31\x2e\x36\x38\x37\x2c\x34\x31\
+\x2e\x36\x36\x34\x63\x2d\x31\x30\x2e\x38\x35\x32\x2c\x31\x30\x2e\
+\x38\x33\x36\x2d\x32\x33\x2e\x39\x33\x2c\x31\x30\x2e\x38\x35\x39\
+\x2d\x33\x31\x2e\x35\x36\x34\x2c\x31\x2e\x38\x35\x32\x0a\x09\x63\
+\x2d\x35\x2e\x30\x35\x37\x2d\x35\x2e\x39\x36\x38\x2d\x33\x2e\x30\
+\x36\x31\x2d\x32\x34\x2e\x33\x37\x34\x2d\x31\x2e\x36\x34\x34\x2d\
+\x33\x36\x2e\x30\x34\x39\x6c\x32\x30\x2e\x39\x30\x37\x2d\x31\x37\
+\x31\x2e\x38\x34\x39\x63\x31\x2e\x38\x36\x37\x2d\x31\x35\x2e\x33\
+\x35\x33\x2d\x39\x2e\x30\x37\x2d\x33\x30\x2e\x31\x38\x35\x2d\x32\
+\x34\x2e\x34\x33\x2d\x33\x32\x2e\x30\x35\x31\x0a\x09\x63\x2d\x31\
+\x35\x2e\x33\x35\x38\x2d\x31\x2e\x38\x36\x37\x2d\x32\x39\x2e\x33\
+\x32\x32\x2c\x39\x2e\x39\x33\x39\x2d\x33\x31\x2e\x31\x39\x31\x2c\
+\x32\x35\x2e\x32\x38\x39\x4c\x32\x36\x37\x2e\x33\x37\x2c\x32\x33\
+\x36\x2e\x30\x32\x31\x63\x2d\x31\x2e\x32\x30\x35\x2c\x33\x2e\x33\
+\x35\x38\x2d\x33\x2e\x37\x39\x2c\x33\x2e\x39\x33\x38\x2d\x34\x2e\
+\x30\x38\x31\x2d\x30\x2e\x35\x38\x32\x4c\x32\x35\x35\x2e\x34\x34\
+\x2c\x36\x30\x0a\x09\x63\x30\x2d\x31\x35\x2e\x34\x36\x35\x2d\x31\
+\x32\x2e\x35\x34\x32\x2d\x32\x38\x2d\x32\x38\x2e\x30\x31\x34\x2d\
+\x32\x38\x63\x2d\x31\x35\x2e\x34\x37\x33\x2c\x30\x2d\x32\x38\x2e\
+\x30\x31\x35\x2c\x31\x32\x2e\x35\x33\x35\x2d\x32\x38\x2e\x30\x31\
+\x35\x2c\x32\x38\x6c\x2d\x30\x2e\x35\x35\x32\x2c\x31\x37\x36\x2e\
+\x37\x35\x32\x63\x30\x2e\x31\x34\x36\x2c\x32\x2e\x30\x34\x2d\x31\
+\x2e\x36\x30\x34\x2c\x32\x2e\x36\x32\x34\x2d\x31\x2e\x39\x32\x2c\
+\x30\x2e\x32\x39\x34\x4c\x31\x37\x32\x2e\x30\x31\x36\x2c\x39\x39\
+\x2e\x30\x37\x37\x0a\x09\x63\x2d\x32\x2e\x37\x35\x2d\x31\x35\x2e\
+\x32\x31\x39\x2d\x31\x37\x2e\x33\x32\x33\x2d\x32\x36\x2e\x32\x30\
+\x33\x2d\x33\x32\x2e\x35\x34\x38\x2d\x32\x33\x2e\x34\x35\x33\x63\
+\x2d\x31\x35\x2e\x32\x32\x37\x2c\x32\x2e\x37\x34\x38\x2d\x32\x35\
+\x2e\x33\x33\x39\x2c\x31\x38\x2e\x31\x38\x37\x2d\x32\x32\x2e\x35\
+\x39\x31\x2c\x33\x33\x2e\x34\x30\x33\x6c\x32\x32\x2e\x31\x39\x33\
+\x2c\x31\x36\x31\x2e\x34\x35\x35\x0a\x09\x63\x30\x2e\x30\x32\x33\
+\x2c\x32\x2e\x38\x37\x32\x2d\x30\x2e\x39\x34\x31\x2c\x34\x2e\x35\
+\x31\x33\x2d\x32\x2e\x33\x30\x38\x2c\x30\x2e\x38\x33\x31\x6c\x2d\
+\x33\x33\x2e\x31\x30\x39\x2d\x38\x38\x2e\x35\x31\x37\x63\x2d\x35\
+\x2e\x31\x38\x2d\x31\x34\x2e\x35\x37\x32\x2d\x32\x31\x2e\x31\x39\
+\x36\x2d\x32\x33\x2e\x30\x36\x35\x2d\x33\x35\x2e\x37\x37\x36\x2d\
+\x31\x37\x2e\x38\x38\x39\x0a\x09\x63\x2d\x31\x34\x2e\x35\x37\x39\
+\x2c\x35\x2e\x31\x37\x37\x2d\x32\x32\x2e\x32\x30\x31\x2c\x32\x32\
+\x2e\x30\x36\x31\x2d\x31\x37\x2e\x30\x32\x33\x2c\x33\x36\x2e\x36\
+\x33\x31\x6c\x35\x38\x2e\x30\x34\x32\x2c\x31\x38\x39\x2e\x36\x32\
+\x35\x63\x30\x2e\x33\x30\x33\x2c\x31\x2e\x30\x34\x36\x2c\x30\x2e\
+\x36\x32\x34\x2c\x32\x2e\x30\x38\x35\x2c\x30\x2e\x39\x35\x33\x2c\
+\x33\x2e\x31\x31\x38\x6c\x30\x2e\x31\x32\x31\x2c\x30\x2e\x33\x39\
+\x0a\x09\x63\x30\x2e\x30\x31\x31\x2c\x30\x2e\x30\x33\x31\x2c\x30\
+\x2e\x30\x32\x35\x2c\x30\x2e\x30\x35\x38\x2c\x30\x2e\x30\x33\x35\
+\x2c\x30\x2e\x30\x38\x38\x43\x31\x32\x36\x2e\x30\x37\x39\x2c\x34\
+\x34\x34\x2e\x32\x33\x33\x2c\x31\x37\x32\x2e\x35\x37\x2c\x34\x38\
+\x30\x2c\x32\x32\x37\x2e\x34\x32\x37\x2c\x34\x38\x30\x63\x33\x35\
+\x2e\x31\x31\x36\x2c\x30\x2c\x37\x31\x2e\x35\x39\x31\x2d\x31\x32\
+\x2e\x33\x37\x38\x2c\x39\x39\x2e\x33\x35\x37\x2d\x33\x33\x2e\x36\
+\x37\x32\x0a\x09\x63\x30\x2e\x30\x30\x31\x2c\x30\x2c\x30\x2e\x30\
+\x30\x33\x2d\x30\x2e\x30\x30\x32\x2c\x30\x2e\x30\x30\x33\x2d\x30\
+\x2e\x30\x30\x32\x63\x32\x39\x2e\x39\x39\x2d\x31\x38\x2e\x30\x35\
+\x31\x2c\x31\x32\x36\x2e\x30\x37\x31\x2d\x31\x32\x31\x2e\x33\x34\
+\x37\x2c\x31\x32\x36\x2e\x30\x37\x31\x2d\x31\x32\x31\x2e\x33\x34\
+\x37\x43\x34\x36\x37\x2e\x34\x34\x35\x2c\x33\x31\x30\x2e\x34\x30\
+\x32\x2c\x34\x36\x35\x2e\x32\x36\x36\x2c\x32\x38\x38\x2e\x30\x38\
+\x2c\x34\x35\x30\x2e\x36\x37\x39\x2c\x32\x37\x33\x2e\x35\x7a\x22\
+\x2f\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\
\x00\x00\x03\xfe\
\x3c\
\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x27\x31\x2e\
@@ -166,151 +169,99 @@ qt_resource_data = b"\
\x30\x33\x37\x35\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x77\x69\x64\
\x74\x68\x3d\x27\x34\x2e\x30\x31\x35\x27\x2f\x3e\x0a\x3c\x2f\x67\
\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\
-\x00\x00\x04\x9c\
-\x3c\
-\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
-\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
-\x2d\x38\x22\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\x72\
-\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\x20\x49\x6c\x6c\x75\
-\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x38\x2e\x31\x2e\x30\x2c\x20\
-\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\x50\x6c\x75\x67\x2d\
-\x49\x6e\x20\x2e\x20\x53\x56\x47\x20\x56\x65\x72\x73\x69\x6f\x6e\
-\x3a\x20\x36\x2e\x30\x30\x20\x42\x75\x69\x6c\x64\x20\x30\x29\x20\
-\x20\x2d\x2d\x3e\x0a\x3c\x21\x44\x4f\x43\x54\x59\x50\x45\x20\x73\
-\x76\x67\x20\x50\x55\x42\x4c\x49\x43\x20\x22\x2d\x2f\x2f\x57\x33\
-\x43\x2f\x2f\x44\x54\x44\x20\x53\x56\x47\x20\x31\x2e\x31\x2f\x2f\
-\x45\x4e\x22\x20\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\
-\x77\x33\x2e\x6f\x72\x67\x2f\x47\x72\x61\x70\x68\x69\x63\x73\x2f\
-\x53\x56\x47\x2f\x31\x2e\x31\x2f\x44\x54\x44\x2f\x73\x76\x67\x31\
-\x31\x2e\x64\x74\x64\x22\x3e\x0a\x3c\x73\x76\x67\x20\x76\x65\x72\
-\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\x3d\x22\x43\
-\x6f\x64\x65\x22\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\x74\x74\x70\
-\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x32\x30\
-\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\x6e\x73\x3a\x78\x6c\
-\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\
-\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\x78\x6c\x69\x6e\
-\x6b\x22\x20\x78\x3d\x22\x32\x34\x70\x78\x22\x20\x79\x3d\x22\x32\
-\x34\x70\x78\x22\x0a\x09\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\
-\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x65\x6e\x61\
-\x62\x6c\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3d\x22\
-\x6e\x65\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\
-\x20\x78\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\x65\x73\
-\x65\x72\x76\x65\x22\x3e\x0a\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\
-\x6f\x72\x6d\x3d\x27\x6d\x61\x74\x72\x69\x78\x28\x32\x34\x20\x30\
-\x20\x30\x20\x32\x34\x20\x30\x20\x30\x29\x27\x3e\x3c\x70\x61\x74\
-\x68\x20\x64\x3d\x22\x4d\x35\x2e\x37\x31\x39\x2c\x31\x34\x2e\x37\
-\x35\x63\x2d\x30\x2e\x32\x33\x36\x2c\x30\x2d\x30\x2e\x34\x37\x34\
-\x2d\x30\x2e\x30\x38\x33\x2d\x30\x2e\x36\x36\x34\x2d\x30\x2e\x32\
-\x35\x32\x4c\x2d\x30\x2e\x30\x30\x35\x2c\x31\x30\x6c\x35\x2e\x33\
-\x34\x31\x2d\x34\x2e\x37\x34\x38\x43\x35\x2e\x37\x34\x38\x2c\x34\
-\x2e\x38\x38\x37\x2c\x36\x2e\x33\x38\x2c\x34\x2e\x39\x32\x32\x2c\
-\x36\x2e\x37\x34\x37\x2c\x35\x2e\x33\x33\x35\x0a\x09\x63\x30\x2e\
-\x33\x36\x37\x2c\x30\x2e\x34\x31\x33\x2c\x30\x2e\x33\x33\x2c\x31\
-\x2e\x30\x34\x35\x2d\x30\x2e\x30\x38\x33\x2c\x31\x2e\x34\x31\x32\
-\x4c\x33\x2e\x30\x30\x35\x2c\x31\x30\x6c\x33\x2e\x33\x37\x38\x2c\
-\x33\x2e\x30\x30\x32\x63\x30\x2e\x34\x31\x33\x2c\x30\x2e\x33\x36\
-\x37\x2c\x30\x2e\x34\x35\x2c\x30\x2e\x39\x39\x39\x2c\x30\x2e\x30\
-\x38\x33\x2c\x31\x2e\x34\x31\x32\x0a\x09\x43\x36\x2e\x32\x36\x39\
-\x2c\x31\x34\x2e\x36\x33\x37\x2c\x35\x2e\x39\x39\x34\x2c\x31\x34\
-\x2e\x37\x35\x2c\x35\x2e\x37\x31\x39\x2c\x31\x34\x2e\x37\x35\x7a\
-\x20\x4d\x31\x34\x2e\x36\x36\x34\x2c\x31\x34\x2e\x37\x34\x38\x4c\
-\x32\x30\x2e\x30\x30\x35\x2c\x31\x30\x6c\x2d\x35\x2e\x30\x36\x2d\
-\x34\x2e\x34\x39\x38\x63\x2d\x30\x2e\x34\x31\x33\x2d\x30\x2e\x33\
-\x36\x37\x2d\x31\x2e\x30\x34\x35\x2d\x30\x2e\x33\x33\x2d\x31\x2e\
-\x34\x31\x31\x2c\x30\x2e\x30\x38\x33\x0a\x09\x63\x2d\x30\x2e\x33\
-\x36\x37\x2c\x30\x2e\x34\x31\x33\x2d\x30\x2e\x33\x33\x2c\x31\x2e\
-\x30\x34\x35\x2c\x30\x2e\x30\x38\x33\x2c\x31\x2e\x34\x31\x32\x4c\
-\x31\x36\x2e\x39\x39\x35\x2c\x31\x30\x6c\x2d\x33\x2e\x36\x35\x39\
-\x2c\x33\x2e\x32\x35\x32\x63\x2d\x30\x2e\x34\x31\x33\x2c\x30\x2e\
-\x33\x36\x37\x2d\x30\x2e\x34\x35\x2c\x30\x2e\x39\x39\x39\x2d\x30\
-\x2e\x30\x38\x33\x2c\x31\x2e\x34\x31\x32\x43\x31\x33\x2e\x34\x35\
-\x2c\x31\x34\x2e\x38\x38\x37\x2c\x31\x33\x2e\x37\x32\x35\x2c\x31\
-\x35\x2c\x31\x34\x2c\x31\x35\x0a\x09\x43\x31\x34\x2e\x32\x33\x36\
-\x2c\x31\x35\x2c\x31\x34\x2e\x34\x37\x34\x2c\x31\x34\x2e\x39\x31\
-\x37\x2c\x31\x34\x2e\x36\x36\x34\x2c\x31\x34\x2e\x37\x34\x38\x7a\
-\x20\x4d\x39\x2e\x39\x38\x36\x2c\x31\x36\x2e\x31\x36\x35\x6c\x32\
-\x2d\x31\x32\x63\x30\x2e\x30\x39\x31\x2d\x30\x2e\x35\x34\x35\x2d\
-\x30\x2e\x32\x37\x37\x2d\x31\x2e\x30\x36\x2d\x30\x2e\x38\x32\x32\
-\x2d\x31\x2e\x31\x35\x31\x0a\x09\x63\x2d\x30\x2e\x35\x34\x37\x2d\
-\x30\x2e\x30\x39\x32\x2d\x31\x2e\x30\x36\x31\x2c\x30\x2e\x32\x37\
-\x37\x2d\x31\x2e\x31\x35\x2c\x30\x2e\x38\x32\x32\x6c\x2d\x32\x2c\
-\x31\x32\x63\x2d\x30\x2e\x30\x39\x31\x2c\x30\x2e\x35\x34\x35\x2c\
-\x30\x2e\x32\x37\x37\x2c\x31\x2e\x30\x36\x2c\x30\x2e\x38\x32\x32\
-\x2c\x31\x2e\x31\x35\x31\x43\x38\x2e\x38\x39\x32\x2c\x31\x36\x2e\
-\x39\x39\x36\x2c\x38\x2e\x39\x34\x36\x2c\x31\x37\x2c\x39\x2e\x30\
-\x30\x31\x2c\x31\x37\x0a\x09\x43\x39\x2e\x34\x38\x31\x2c\x31\x37\
-\x2c\x39\x2e\x39\x30\x35\x2c\x31\x36\x2e\x36\x35\x33\x2c\x39\x2e\
-\x39\x38\x36\x2c\x31\x36\x2e\x31\x36\x35\x7a\x22\x2f\x3e\x0a\x3c\
-\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\
-\x00\x00\x04\x17\
+\x00\x00\x05\x9c\
\x3c\
-\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
-\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x69\x73\x6f\
-\x2d\x38\x38\x35\x39\x2d\x31\x22\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\
-\x47\x65\x6e\x65\x72\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\
-\x20\x49\x6c\x6c\x75\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x39\x2e\
-\x30\x2e\x30\x2c\x20\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\
-\x50\x6c\x75\x67\x2d\x49\x6e\x20\x2e\x20\x53\x56\x47\x20\x56\x65\
-\x72\x73\x69\x6f\x6e\x3a\x20\x36\x2e\x30\x30\x20\x42\x75\x69\x6c\
-\x64\x20\x30\x29\x20\x20\x2d\x2d\x3e\x0a\x3c\x73\x76\x67\x20\x76\
-\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\x3d\
-\x22\x4c\x61\x79\x65\x72\x5f\x31\x22\x20\x78\x6d\x6c\x6e\x73\x3d\
-\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\
-\x72\x67\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\
-\x6e\x73\x3a\x78\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\
-\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\
-\x2f\x78\x6c\x69\x6e\x6b\x22\x20\x78\x3d\x22\x30\x70\x78\x22\x20\
-\x79\x3d\x22\x30\x70\x78\x22\x0a\x09\x20\x76\x69\x65\x77\x42\x6f\
-\x78\x3d\x22\x30\x20\x30\x20\x34\x32\x33\x2e\x37\x35\x34\x20\x34\
-\x32\x33\x2e\x37\x35\x34\x22\x20\x73\x74\x79\x6c\x65\x3d\x22\x65\
-\x6e\x61\x62\x6c\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\
-\x3a\x6e\x65\x77\x20\x30\x20\x30\x20\x34\x32\x33\x2e\x37\x35\x34\
-\x20\x34\x32\x33\x2e\x37\x35\x34\x3b\x22\x20\x78\x6d\x6c\x3a\x73\
-\x70\x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\x72\x76\x65\x22\x3e\
-\x0a\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x33\x35\x34\x2e\x32\
-\x34\x2c\x34\x37\x2e\x34\x6c\x33\x39\x2e\x38\x37\x39\x2d\x33\x39\
-\x2e\x38\x37\x39\x48\x32\x37\x32\x2e\x31\x39\x36\x76\x31\x32\x31\
-\x2e\x39\x32\x34\x6c\x36\x30\x2e\x38\x30\x31\x2d\x36\x30\x2e\x38\
-\x30\x31\x63\x35\x36\x2c\x35\x30\x2e\x30\x36\x36\x2c\x37\x37\x2e\
-\x32\x35\x31\x2c\x31\x33\x32\x2e\x30\x30\x34\x2c\x34\x36\x2e\x39\
-\x31\x38\x2c\x32\x30\x35\x2e\x32\x33\x35\x0a\x09\x63\x2d\x31\x38\
-\x2e\x35\x38\x35\x2c\x34\x34\x2e\x38\x36\x39\x2d\x35\x33\x2e\x35\
-\x33\x31\x2c\x37\x39\x2e\x38\x31\x35\x2d\x39\x38\x2e\x34\x2c\x39\
-\x38\x2e\x34\x63\x2d\x34\x34\x2e\x38\x36\x36\x2c\x31\x38\x2e\x35\
-\x38\x35\x2d\x39\x34\x2e\x32\x38\x38\x2c\x31\x38\x2e\x35\x38\x35\
-\x2d\x31\x33\x39\x2e\x31\x35\x38\x2c\x30\x63\x2d\x34\x34\x2e\x38\
-\x36\x39\x2d\x31\x38\x2e\x35\x38\x35\x2d\x37\x39\x2e\x38\x31\x35\
-\x2d\x35\x33\x2e\x35\x33\x31\x2d\x39\x38\x2e\x34\x2d\x39\x38\x2e\
-\x34\x0a\x09\x63\x2d\x31\x38\x2e\x35\x38\x35\x2d\x34\x34\x2e\x38\
-\x36\x39\x2d\x31\x38\x2e\x35\x38\x35\x2d\x39\x34\x2e\x32\x39\x2c\
-\x30\x2d\x31\x33\x39\x2e\x31\x35\x39\x6c\x2d\x32\x37\x2e\x37\x31\
-\x37\x2d\x31\x31\x2e\x34\x38\x63\x2d\x32\x31\x2e\x36\x35\x31\x2c\
-\x35\x32\x2e\x32\x37\x32\x2d\x32\x31\x2e\x36\x35\x31\x2c\x31\x30\
-\x39\x2e\x38\x34\x38\x2c\x30\x2c\x31\x36\x32\x2e\x31\x32\x0a\x09\
-\x63\x32\x31\x2e\x36\x35\x32\x2c\x35\x32\x2e\x32\x37\x32\x2c\x36\
-\x32\x2e\x33\x36\x34\x2c\x39\x32\x2e\x39\x38\x34\x2c\x31\x31\x34\
-\x2e\x36\x33\x37\x2c\x31\x31\x34\x2e\x36\x33\x36\x63\x32\x36\x2e\
-\x31\x34\x2c\x31\x30\x2e\x38\x32\x37\x2c\x35\x33\x2e\x35\x39\x35\
-\x2c\x31\x36\x2e\x32\x34\x2c\x38\x31\x2e\x30\x36\x2c\x31\x36\x2e\
-\x32\x33\x39\x63\x32\x37\x2e\x34\x35\x39\x2d\x30\x2e\x30\x30\x31\
-\x2c\x35\x34\x2e\x39\x32\x37\x2d\x35\x2e\x34\x31\x34\x2c\x38\x31\
-\x2e\x30\x36\x31\x2d\x31\x36\x2e\x32\x33\x39\x0a\x09\x63\x35\x32\
-\x2e\x32\x37\x31\x2d\x32\x31\x2e\x36\x35\x32\x2c\x39\x32\x2e\x39\
-\x38\x33\x2d\x36\x32\x2e\x33\x36\x34\x2c\x31\x31\x34\x2e\x36\x33\
-\x36\x2d\x31\x31\x34\x2e\x36\x33\x36\x43\x34\x34\x32\x2e\x37\x33\
-\x39\x2c\x32\x30\x30\x2e\x36\x2c\x34\x31\x38\x2e\x35\x33\x32\x2c\
-\x31\x30\x35\x2e\x38\x32\x36\x2c\x33\x35\x34\x2e\x32\x34\x2c\x34\
-\x37\x2e\x34\x7a\x22\x2f\x3e\x0a\x3c\x67\x3e\x0a\x3c\x2f\x67\x3e\
-\x0a\x3c\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\x3e\x0a\x3c\x2f\
-\x67\x3e\x0a\x3c\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\x3e\x0a\
-\x3c\x2f\x67\x3e\x0a\x3c\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\
-\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\
-\x3c\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\x3e\x0a\x3c\x2f\x67\
-\x3e\x0a\x3c\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\x3e\x0a\x3c\
-\x2f\x67\x3e\x0a\x3c\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\x3e\
-\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\
-\x2f\x73\x76\x67\x3e\x0a\
-\x00\x00\x03\x3d\
+\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x27\x31\x2e\
+\x30\x27\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x27\x55\x54\x46\
+\x2d\x38\x27\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x54\x68\x69\x73\x20\
+\x66\x69\x6c\x65\x20\x77\x61\x73\x20\x67\x65\x6e\x65\x72\x61\x74\
+\x65\x64\x20\x62\x79\x20\x64\x76\x69\x73\x76\x67\x6d\x20\x32\x2e\
+\x31\x31\x2e\x31\x20\x2d\x2d\x3e\x0a\x3c\x73\x76\x67\x20\x76\x65\
+\x72\x73\x69\x6f\x6e\x3d\x27\x31\x2e\x31\x27\x20\x78\x6d\x6c\x6e\
+\x73\x3d\x27\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\
+\x2e\x6f\x72\x67\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x27\x20\x78\
+\x6d\x6c\x6e\x73\x3a\x78\x6c\x69\x6e\x6b\x3d\x27\x68\x74\x74\x70\
+\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\
+\x39\x39\x2f\x78\x6c\x69\x6e\x6b\x27\x20\x77\x69\x64\x74\x68\x3d\
+\x27\x36\x33\x2e\x39\x39\x39\x36\x70\x74\x27\x20\x68\x65\x69\x67\
+\x68\x74\x3d\x27\x36\x34\x70\x74\x27\x20\x76\x69\x65\x77\x42\x6f\
+\x78\x3d\x27\x35\x36\x2e\x34\x30\x39\x34\x20\x31\x31\x37\x2e\x38\
+\x35\x38\x20\x36\x33\x2e\x39\x39\x39\x36\x20\x36\x34\x27\x3e\x0a\
+\x3c\x67\x20\x69\x64\x3d\x27\x70\x61\x67\x65\x31\x27\x3e\x0a\x3c\
+\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x74\x72\x61\
+\x6e\x73\x6c\x61\x74\x65\x28\x35\x36\x2e\x34\x30\x39\x34\x20\x31\
+\x31\x37\x2e\x38\x35\x38\x29\x73\x63\x61\x6c\x65\x28\x2e\x39\x39\
+\x36\x32\x36\x34\x29\x27\x3e\x0a\x3c\x70\x61\x74\x68\x20\x64\x3d\
+\x27\x4d\x20\x35\x34\x2e\x38\x39\x32\x36\x20\x32\x34\x2e\x35\x32\
+\x39\x31\x43\x20\x35\x34\x2e\x38\x39\x32\x36\x20\x32\x30\x2e\x33\
+\x33\x36\x38\x20\x34\x34\x2e\x36\x39\x36\x39\x20\x31\x36\x2e\x39\
+\x33\x38\x33\x20\x33\x32\x2e\x31\x32\x20\x31\x36\x2e\x39\x33\x38\
+\x33\x43\x20\x31\x39\x2e\x35\x34\x33\x31\x20\x31\x36\x2e\x39\x33\
+\x38\x33\x20\x39\x2e\x33\x34\x37\x34\x32\x20\x32\x30\x2e\x33\x33\
+\x36\x38\x20\x39\x2e\x33\x34\x37\x34\x32\x20\x32\x34\x2e\x35\x32\
+\x39\x31\x43\x20\x39\x2e\x33\x34\x37\x34\x32\x20\x32\x38\x2e\x37\
+\x32\x31\x35\x20\x31\x39\x2e\x35\x34\x33\x31\x20\x33\x32\x2e\x31\
+\x32\x20\x33\x32\x2e\x31\x32\x20\x33\x32\x2e\x31\x32\x43\x20\x34\
+\x34\x2e\x36\x39\x36\x39\x20\x33\x32\x2e\x31\x32\x20\x35\x34\x2e\
+\x38\x39\x32\x36\x20\x32\x38\x2e\x37\x32\x31\x35\x20\x35\x34\x2e\
+\x38\x39\x32\x36\x20\x32\x34\x2e\x35\x32\x39\x31\x5a\x27\x20\x66\
+\x69\x6c\x6c\x3d\x27\x6e\x6f\x6e\x65\x27\x20\x73\x74\x72\x6f\x6b\
+\x65\x3d\x27\x23\x30\x30\x30\x30\x30\x30\x27\x20\x73\x74\x72\x6f\
+\x6b\x65\x2d\x6c\x69\x6e\x65\x63\x61\x70\x3d\x27\x72\x6f\x75\x6e\
+\x64\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6c\x69\x6e\x65\x6a\x6f\
+\x69\x6e\x3d\x27\x72\x6f\x75\x6e\x64\x27\x20\x73\x74\x72\x6f\x6b\
+\x65\x2d\x6d\x69\x74\x65\x72\x6c\x69\x6d\x69\x74\x3d\x27\x31\x30\
+\x2e\x30\x33\x37\x35\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x77\x69\
+\x64\x74\x68\x3d\x27\x33\x2e\x35\x31\x33\x31\x32\x27\x2f\x3e\x0a\
+\x3c\x2f\x67\x3e\x0a\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\
+\x6d\x3d\x27\x74\x72\x61\x6e\x73\x6c\x61\x74\x65\x28\x35\x36\x2e\
+\x34\x30\x39\x34\x20\x31\x31\x37\x2e\x38\x35\x38\x29\x73\x63\x61\
+\x6c\x65\x28\x2e\x39\x39\x36\x32\x36\x34\x29\x27\x3e\x0a\x3c\x70\
+\x61\x74\x68\x20\x64\x3d\x27\x4d\x20\x39\x2e\x33\x34\x37\x34\x32\
+\x20\x32\x34\x2e\x35\x32\x39\x31\x4c\x20\x39\x2e\x33\x34\x37\x34\
+\x32\x20\x35\x34\x2e\x38\x39\x32\x36\x4c\x20\x39\x2e\x33\x34\x37\
+\x34\x32\x20\x35\x34\x2e\x38\x39\x32\x36\x43\x20\x39\x2e\x33\x34\
+\x37\x34\x32\x20\x35\x34\x2e\x38\x39\x32\x36\x20\x39\x2e\x33\x34\
+\x37\x34\x32\x20\x35\x34\x2e\x38\x39\x32\x36\x20\x39\x2e\x33\x34\
+\x37\x34\x32\x20\x35\x34\x2e\x38\x39\x32\x36\x43\x20\x39\x2e\x33\
+\x34\x37\x34\x32\x20\x35\x39\x2e\x30\x38\x34\x39\x20\x31\x39\x2e\
+\x35\x34\x33\x31\x20\x36\x32\x2e\x34\x38\x33\x34\x20\x33\x32\x2e\
+\x31\x32\x20\x36\x32\x2e\x34\x38\x33\x34\x43\x20\x34\x34\x2e\x36\
+\x39\x36\x39\x20\x36\x32\x2e\x34\x38\x33\x34\x20\x35\x34\x2e\x38\
+\x39\x32\x36\x20\x35\x39\x2e\x30\x38\x34\x39\x20\x35\x34\x2e\x38\
+\x39\x32\x36\x20\x35\x34\x2e\x38\x39\x32\x36\x4c\x20\x35\x34\x2e\
+\x38\x39\x32\x36\x20\x35\x34\x2e\x38\x39\x32\x36\x4c\x20\x35\x34\
+\x2e\x38\x39\x32\x36\x20\x32\x34\x2e\x35\x32\x39\x31\x27\x20\x66\
+\x69\x6c\x6c\x3d\x27\x6e\x6f\x6e\x65\x27\x20\x73\x74\x72\x6f\x6b\
+\x65\x3d\x27\x23\x30\x30\x30\x30\x30\x30\x27\x20\x73\x74\x72\x6f\
+\x6b\x65\x2d\x6c\x69\x6e\x65\x63\x61\x70\x3d\x27\x72\x6f\x75\x6e\
+\x64\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6c\x69\x6e\x65\x6a\x6f\
+\x69\x6e\x3d\x27\x72\x6f\x75\x6e\x64\x27\x20\x73\x74\x72\x6f\x6b\
+\x65\x2d\x6d\x69\x74\x65\x72\x6c\x69\x6d\x69\x74\x3d\x27\x31\x30\
+\x2e\x30\x33\x37\x35\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x77\x69\
+\x64\x74\x68\x3d\x27\x33\x2e\x35\x31\x33\x31\x32\x27\x2f\x3e\x0a\
+\x3c\x2f\x67\x3e\x0a\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\
+\x6d\x3d\x27\x74\x72\x61\x6e\x73\x6c\x61\x74\x65\x28\x35\x36\x2e\
+\x34\x30\x39\x34\x20\x31\x31\x37\x2e\x38\x35\x38\x29\x73\x63\x61\
+\x6c\x65\x28\x2e\x39\x39\x36\x32\x36\x34\x29\x27\x3e\x0a\x3c\x70\
+\x61\x74\x68\x20\x64\x3d\x27\x4d\x20\x35\x34\x2e\x38\x39\x32\x36\
+\x20\x32\x34\x2e\x35\x32\x39\x31\x43\x20\x35\x34\x2e\x38\x39\x32\
+\x36\x20\x31\x31\x2e\x39\x35\x32\x32\x20\x34\x34\x2e\x36\x39\x36\
+\x39\x20\x31\x2e\x37\x35\x36\x35\x36\x20\x33\x32\x2e\x31\x32\x20\
+\x31\x2e\x37\x35\x36\x35\x36\x43\x20\x31\x39\x2e\x35\x34\x33\x31\
+\x20\x31\x2e\x37\x35\x36\x35\x36\x20\x39\x2e\x33\x34\x37\x34\x32\
+\x20\x31\x31\x2e\x39\x35\x32\x32\x20\x39\x2e\x33\x34\x37\x34\x32\
+\x20\x32\x34\x2e\x35\x32\x39\x31\x27\x20\x66\x69\x6c\x6c\x3d\x27\
+\x6e\x6f\x6e\x65\x27\x20\x73\x74\x72\x6f\x6b\x65\x3d\x27\x23\x30\
+\x30\x30\x30\x30\x30\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6c\x69\
+\x6e\x65\x63\x61\x70\x3d\x27\x72\x6f\x75\x6e\x64\x27\x20\x73\x74\
+\x72\x6f\x6b\x65\x2d\x6c\x69\x6e\x65\x6a\x6f\x69\x6e\x3d\x27\x72\
+\x6f\x75\x6e\x64\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6d\x69\x74\
+\x65\x72\x6c\x69\x6d\x69\x74\x3d\x27\x31\x30\x2e\x30\x33\x37\x35\
+\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x77\x69\x64\x74\x68\x3d\x27\
+\x33\x2e\x35\x31\x33\x31\x32\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\
+\x3c\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\
+\x00\x00\x02\xab\
\x3c\
\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
@@ -337,40 +288,31 @@ qt_resource_data = b"\
\x22\x30\x70\x78\x22\x0a\x09\x20\x77\x69\x64\x74\x68\x3d\x22\x35\
\x31\x32\x70\x78\x22\x20\x68\x65\x69\x67\x68\x74\x3d\x22\x35\x31\
\x32\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\x20\
-\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x73\x74\x79\x6c\x65\
-\x3d\x22\x65\x6e\x61\x62\x6c\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\
-\x75\x6e\x64\x3a\x6e\x65\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\
-\x35\x31\x32\x3b\x22\x20\x78\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\
-\x22\x70\x72\x65\x73\x65\x72\x76\x65\x22\x3e\x0a\x3c\x70\x61\x74\
-\x68\x20\x64\x3d\x22\x4d\x34\x33\x37\x2e\x35\x2c\x33\x38\x36\x2e\
-\x36\x4c\x33\x30\x36\x2e\x39\x2c\x32\x35\x36\x6c\x31\x33\x30\x2e\
-\x36\x2d\x31\x33\x30\x2e\x36\x63\x31\x34\x2e\x31\x2d\x31\x34\x2e\
-\x31\x2c\x31\x34\x2e\x31\x2d\x33\x36\x2e\x38\x2c\x30\x2d\x35\x30\
-\x2e\x39\x63\x2d\x31\x34\x2e\x31\x2d\x31\x34\x2e\x31\x2d\x33\x36\
-\x2e\x38\x2d\x31\x34\x2e\x31\x2d\x35\x30\x2e\x39\x2c\x30\x4c\x32\
-\x35\x36\x2c\x32\x30\x35\x2e\x31\x4c\x31\x32\x35\x2e\x34\x2c\x37\
-\x34\x2e\x35\x0a\x09\x63\x2d\x31\x34\x2e\x31\x2d\x31\x34\x2e\x31\
-\x2d\x33\x36\x2e\x38\x2d\x31\x34\x2e\x31\x2d\x35\x30\x2e\x39\x2c\
-\x30\x63\x2d\x31\x34\x2e\x31\x2c\x31\x34\x2e\x31\x2d\x31\x34\x2e\
-\x31\x2c\x33\x36\x2e\x38\x2c\x30\x2c\x35\x30\x2e\x39\x4c\x32\x30\
-\x35\x2e\x31\x2c\x32\x35\x36\x4c\x37\x34\x2e\x35\x2c\x33\x38\x36\
-\x2e\x36\x63\x2d\x31\x34\x2e\x31\x2c\x31\x34\x2e\x31\x2d\x31\x34\
-\x2e\x31\x2c\x33\x36\x2e\x38\x2c\x30\x2c\x35\x30\x2e\x39\x0a\x09\
-\x63\x31\x34\x2e\x31\x2c\x31\x34\x2e\x31\x2c\x33\x36\x2e\x38\x2c\
-\x31\x34\x2e\x31\x2c\x35\x30\x2e\x39\x2c\x30\x4c\x32\x35\x36\x2c\
-\x33\x30\x36\x2e\x39\x6c\x31\x33\x30\x2e\x36\x2c\x31\x33\x30\x2e\
-\x36\x63\x31\x34\x2e\x31\x2c\x31\x34\x2e\x31\x2c\x33\x36\x2e\x38\
-\x2c\x31\x34\x2e\x31\x2c\x35\x30\x2e\x39\x2c\x30\x43\x34\x35\x31\
-\x2e\x35\x2c\x34\x32\x33\x2e\x34\x2c\x34\x35\x31\x2e\x35\x2c\x34\
-\x30\x30\x2e\x36\x2c\x34\x33\x37\x2e\x35\x2c\x33\x38\x36\x2e\x36\
-\x7a\x22\x2f\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\
-\x00\x00\x03\xb7\
+\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x65\x6e\x61\x62\x6c\
+\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3d\x22\x6e\x65\
+\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x78\
+\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\x72\
+\x76\x65\x22\x3e\x0a\x3c\x67\x20\x69\x64\x3d\x22\x49\x63\x6f\x6e\
+\x5f\x35\x5f\x22\x3e\x0a\x09\x3c\x67\x3e\x0a\x09\x09\x3c\x70\x6f\
+\x6c\x79\x67\x6f\x6e\x20\x70\x6f\x69\x6e\x74\x73\x3d\x22\x34\x30\
+\x35\x2c\x31\x33\x36\x2e\x37\x39\x38\x20\x33\x37\x35\x2e\x32\x30\
+\x32\x2c\x31\x30\x37\x20\x32\x35\x36\x2c\x32\x32\x36\x2e\x32\x30\
+\x32\x20\x31\x33\x36\x2e\x37\x39\x38\x2c\x31\x30\x37\x20\x31\x30\
+\x37\x2c\x31\x33\x36\x2e\x37\x39\x38\x20\x32\x32\x36\x2e\x32\x30\
+\x32\x2c\x32\x35\x36\x20\x31\x30\x37\x2c\x33\x37\x35\x2e\x32\x30\
+\x32\x20\x31\x33\x36\x2e\x37\x39\x38\x2c\x34\x30\x35\x20\x32\x35\
+\x36\x2c\x32\x38\x35\x2e\x37\x39\x38\x20\x0a\x09\x09\x09\x33\x37\
+\x35\x2e\x32\x30\x32\x2c\x34\x30\x35\x20\x34\x30\x35\x2c\x33\x37\
+\x35\x2e\x32\x30\x32\x20\x32\x38\x35\x2e\x37\x39\x38\x2c\x32\x35\
+\x36\x20\x09\x09\x22\x2f\x3e\x0a\x09\x3c\x2f\x67\x3e\x0a\x3c\x2f\
+\x67\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\
+\x00\x00\x02\x6c\
\x3c\
\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
\x2d\x38\x22\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\x72\
\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\x20\x49\x6c\x6c\x75\
-\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x38\x2e\x31\x2e\x30\x2c\x20\
+\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x36\x2e\x32\x2e\x31\x2c\x20\
\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\x50\x6c\x75\x67\x2d\
\x49\x6e\x20\x2e\x20\x53\x56\x47\x20\x56\x65\x72\x73\x69\x6f\x6e\
\x3a\x20\x36\x2e\x30\x30\x20\x42\x75\x69\x6c\x64\x20\x30\x29\x20\
@@ -381,52 +323,31 @@ qt_resource_data = b"\
\x77\x33\x2e\x6f\x72\x67\x2f\x47\x72\x61\x70\x68\x69\x63\x73\x2f\
\x53\x56\x47\x2f\x31\x2e\x31\x2f\x44\x54\x44\x2f\x73\x76\x67\x31\
\x31\x2e\x64\x74\x64\x22\x3e\x0a\x3c\x73\x76\x67\x20\x76\x65\x72\
-\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\x3d\x22\x4d\
-\x61\x67\x6e\x69\x66\x79\x69\x6e\x67\x5f\x67\x6c\x61\x73\x73\x22\
-\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\
-\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x32\x30\x30\x30\x2f\x73\
-\x76\x67\x22\x20\x78\x6d\x6c\x6e\x73\x3a\x78\x6c\x69\x6e\x6b\x3d\
-\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\
-\x72\x67\x2f\x31\x39\x39\x39\x2f\x78\x6c\x69\x6e\x6b\x22\x20\x78\
-\x3d\x22\x30\x70\x78\x22\x0a\x09\x20\x79\x3d\x22\x30\x70\x78\x22\
-\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\x20\x30\x20\x35\x31\
-\x32\x20\x35\x31\x32\x22\x20\x65\x6e\x61\x62\x6c\x65\x2d\x62\x61\
-\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3d\x22\x6e\x65\x77\x20\x30\x20\
-\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x78\x6d\x6c\x3a\x73\
-\x70\x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\x72\x76\x65\x22\x3e\
-\x0a\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x6d\
-\x61\x74\x72\x69\x78\x28\x32\x34\x20\x30\x20\x30\x20\x32\x34\x20\
-\x30\x20\x30\x29\x27\x3e\x0a\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\
-\x4d\x31\x37\x2e\x35\x34\x35\x2c\x31\x35\x2e\x34\x36\x37\x6c\x2d\
-\x33\x2e\x37\x37\x39\x2d\x33\x2e\x37\x37\x39\x63\x30\x2e\x35\x37\
-\x2d\x30\x2e\x39\x33\x35\x2c\x30\x2e\x38\x39\x38\x2d\x32\x2e\x30\
-\x33\x35\x2c\x30\x2e\x38\x39\x38\x2d\x33\x2e\x32\x31\x63\x30\x2d\
-\x33\x2e\x34\x31\x37\x2d\x32\x2e\x39\x36\x31\x2d\x36\x2e\x33\x37\
-\x37\x2d\x36\x2e\x33\x37\x38\x2d\x36\x2e\x33\x37\x37\x0a\x09\x43\
-\x34\x2e\x38\x36\x39\x2c\x32\x2e\x31\x2c\x32\x2e\x31\x2c\x34\x2e\
-\x38\x37\x2c\x32\x2e\x31\x2c\x38\x2e\x32\x38\x37\x63\x30\x2c\x33\
-\x2e\x34\x31\x36\x2c\x32\x2e\x39\x36\x31\x2c\x36\x2e\x33\x37\x37\
-\x2c\x36\x2e\x33\x37\x37\x2c\x36\x2e\x33\x37\x37\x63\x31\x2e\x31\
-\x33\x37\x2c\x30\x2c\x32\x2e\x32\x2d\x30\x2e\x33\x30\x39\x2c\x33\
-\x2e\x31\x31\x35\x2d\x30\x2e\x38\x34\x34\x6c\x33\x2e\x37\x39\x39\
-\x2c\x33\x2e\x38\x30\x31\x0a\x09\x63\x30\x2e\x33\x37\x32\x2c\x30\
-\x2e\x33\x37\x31\x2c\x30\x2e\x39\x37\x35\x2c\x30\x2e\x33\x37\x31\
-\x2c\x31\x2e\x33\x34\x36\x2c\x30\x6c\x30\x2e\x39\x34\x33\x2d\x30\
-\x2e\x39\x34\x33\x43\x31\x38\x2e\x30\x35\x31\x2c\x31\x36\x2e\x33\
-\x30\x37\x2c\x31\x37\x2e\x39\x31\x36\x2c\x31\x35\x2e\x38\x33\x38\
-\x2c\x31\x37\x2e\x35\x34\x35\x2c\x31\x35\x2e\x34\x36\x37\x7a\x20\
-\x4d\x34\x2e\x30\x30\x34\x2c\x38\x2e\x32\x38\x37\x0a\x09\x63\x30\
-\x2d\x32\x2e\x33\x36\x36\x2c\x31\x2e\x39\x31\x37\x2d\x34\x2e\x32\
-\x38\x33\x2c\x34\x2e\x32\x38\x32\x2d\x34\x2e\x32\x38\x33\x63\x32\
-\x2e\x33\x36\x36\x2c\x30\x2c\x34\x2e\x34\x37\x34\x2c\x32\x2e\x31\
-\x30\x37\x2c\x34\x2e\x34\x37\x34\x2c\x34\x2e\x34\x37\x34\x63\x30\
-\x2c\x32\x2e\x33\x36\x35\x2d\x31\x2e\x39\x31\x38\x2c\x34\x2e\x32\
-\x38\x33\x2d\x34\x2e\x32\x38\x33\x2c\x34\x2e\x32\x38\x33\x0a\x09\
-\x43\x36\x2e\x31\x31\x31\x2c\x31\x32\x2e\x37\x36\x2c\x34\x2e\x30\
-\x30\x34\x2c\x31\x30\x2e\x36\x35\x32\x2c\x34\x2e\x30\x30\x34\x2c\
-\x38\x2e\x32\x38\x37\x7a\x22\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\
-\x2f\x73\x76\x67\x3e\x0a\
-\x00\x00\x04\x22\
+\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\x3d\x22\x4c\
+\x61\x79\x65\x72\x5f\x31\x22\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\
+\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\
+\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\x6e\x73\
+\x3a\x78\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\
+\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\x78\
+\x6c\x69\x6e\x6b\x22\x20\x78\x3d\x22\x30\x70\x78\x22\x20\x79\x3d\
+\x22\x30\x70\x78\x22\x0a\x09\x20\x77\x69\x64\x74\x68\x3d\x22\x35\
+\x31\x32\x70\x78\x22\x20\x68\x65\x69\x67\x68\x74\x3d\x22\x35\x31\
+\x32\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\x20\
+\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x65\x6e\x61\x62\x6c\
+\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3d\x22\x6e\x65\
+\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x78\
+\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\x72\
+\x76\x65\x22\x3e\x0a\x3c\x67\x20\x69\x64\x3d\x22\x49\x63\x6f\x6e\
+\x5f\x31\x5f\x22\x3e\x0a\x09\x3c\x67\x3e\x0a\x09\x09\x3c\x67\x3e\
+\x0a\x09\x09\x09\x3c\x70\x6f\x6c\x79\x67\x6f\x6e\x20\x70\x6f\x69\
+\x6e\x74\x73\x3d\x22\x31\x38\x36\x2e\x33\x30\x31\x2c\x33\x33\x39\
+\x2e\x38\x39\x33\x20\x39\x36\x2c\x32\x34\x39\x2e\x34\x36\x31\x20\
+\x36\x34\x2c\x32\x37\x39\x2e\x39\x36\x38\x20\x31\x38\x36\x2e\x33\
+\x30\x31\x2c\x34\x30\x32\x20\x34\x34\x38\x2c\x31\x34\x30\x2e\x35\
+\x30\x36\x20\x34\x31\x36\x2c\x31\x31\x30\x20\x09\x09\x09\x22\x2f\
+\x3e\x0a\x09\x09\x3c\x2f\x67\x3e\x0a\x09\x3c\x2f\x67\x3e\x0a\x3c\
+\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\
+\x00\x00\x04\xa3\
\x3c\
\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x27\x31\x2e\
\x30\x27\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x27\x55\x54\x46\
@@ -449,117 +370,61 @@ qt_resource_data = b"\
\x6e\x73\x6c\x61\x74\x65\x28\x35\x38\x2e\x34\x36\x36\x39\x20\x31\
\x31\x37\x2e\x38\x35\x38\x29\x73\x63\x61\x6c\x65\x28\x2e\x39\x39\
\x36\x32\x36\x34\x29\x27\x3e\x0a\x3c\x70\x61\x74\x68\x20\x64\x3d\
-\x27\x4d\x20\x36\x2e\x30\x32\x32\x35\x20\x33\x32\x2e\x31\x32\x4c\
+\x27\x4d\x20\x36\x2e\x30\x32\x32\x35\x20\x33\x32\x2e\x31\x32\x43\
+\x20\x34\x2e\x33\x35\x34\x33\x38\x20\x32\x34\x2e\x39\x32\x38\x37\
+\x20\x38\x2e\x34\x33\x32\x31\x37\x20\x31\x38\x2e\x30\x30\x31\x34\
\x20\x31\x33\x2e\x39\x36\x38\x37\x20\x31\x32\x2e\x39\x33\x36\x31\
-\x4c\x20\x35\x38\x2e\x32\x31\x37\x35\x20\x32\x31\x2e\x37\x33\x37\
-\x38\x4c\x20\x34\x32\x2e\x37\x34\x34\x35\x20\x34\x31\x2e\x37\x31\
-\x31\x39\x4c\x20\x36\x2e\x30\x32\x32\x35\x20\x33\x32\x2e\x31\x32\
-\x5a\x27\x20\x66\x69\x6c\x6c\x3d\x27\x6e\x6f\x6e\x65\x27\x20\x73\
-\x74\x72\x6f\x6b\x65\x3d\x27\x23\x30\x30\x30\x30\x30\x30\x27\x20\
-\x73\x74\x72\x6f\x6b\x65\x2d\x6c\x69\x6e\x65\x63\x61\x70\x3d\x27\
-\x72\x6f\x75\x6e\x64\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6c\x69\
-\x6e\x65\x6a\x6f\x69\x6e\x3d\x27\x72\x6f\x75\x6e\x64\x27\x20\x73\
-\x74\x72\x6f\x6b\x65\x2d\x6d\x69\x74\x65\x72\x6c\x69\x6d\x69\x74\
-\x3d\x27\x31\x30\x2e\x30\x33\x37\x35\x27\x20\x73\x74\x72\x6f\x6b\
-\x65\x2d\x77\x69\x64\x74\x68\x3d\x27\x32\x2e\x35\x30\x39\x33\x37\
-\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\x20\x74\x72\x61\x6e\
-\x73\x66\x6f\x72\x6d\x3d\x27\x74\x72\x61\x6e\x73\x6c\x61\x74\x65\
-\x28\x35\x38\x2e\x34\x36\x36\x39\x20\x31\x31\x37\x2e\x38\x35\x38\
-\x29\x73\x63\x61\x6c\x65\x28\x2e\x39\x39\x36\x32\x36\x34\x29\x27\
-\x3e\x0a\x3c\x63\x69\x72\x63\x6c\x65\x20\x63\x78\x3d\x27\x36\x2e\
-\x30\x32\x32\x35\x27\x20\x63\x79\x3d\x27\x33\x32\x2e\x31\x32\x27\
-\x20\x66\x69\x6c\x6c\x3d\x27\x23\x66\x66\x30\x30\x30\x30\x27\x20\
-\x72\x3d\x27\x36\x2e\x30\x32\x32\x35\x27\x2f\x3e\x0a\x3c\x2f\x67\
-\x3e\x0a\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\
-\x74\x72\x61\x6e\x73\x6c\x61\x74\x65\x28\x35\x38\x2e\x34\x36\x36\
-\x39\x20\x31\x31\x37\x2e\x38\x35\x38\x29\x73\x63\x61\x6c\x65\x28\
-\x2e\x39\x39\x36\x32\x36\x34\x29\x27\x3e\x0a\x3c\x63\x69\x72\x63\
-\x6c\x65\x20\x63\x78\x3d\x27\x31\x33\x2e\x39\x36\x38\x37\x27\x20\
-\x63\x79\x3d\x27\x31\x32\x2e\x39\x33\x36\x31\x27\x20\x66\x69\x6c\
-\x6c\x3d\x27\x23\x66\x66\x30\x30\x30\x30\x27\x20\x72\x3d\x27\x36\
-\x2e\x30\x32\x32\x35\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\
-\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x74\x72\x61\x6e\
-\x73\x6c\x61\x74\x65\x28\x35\x38\x2e\x34\x36\x36\x39\x20\x31\x31\
-\x37\x2e\x38\x35\x38\x29\x73\x63\x61\x6c\x65\x28\x2e\x39\x39\x36\
-\x32\x36\x34\x29\x27\x3e\x0a\x3c\x63\x69\x72\x63\x6c\x65\x20\x63\
-\x78\x3d\x27\x35\x38\x2e\x32\x31\x37\x35\x27\x20\x63\x79\x3d\x27\
-\x32\x31\x2e\x37\x33\x37\x38\x27\x20\x66\x69\x6c\x6c\x3d\x27\x23\
-\x66\x66\x30\x30\x30\x30\x27\x20\x72\x3d\x27\x36\x2e\x30\x32\x32\
-\x35\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\x20\x74\x72\x61\
+\x43\x20\x33\x31\x2e\x37\x33\x33\x39\x20\x2d\x33\x2e\x33\x31\x36\
+\x37\x35\x20\x35\x37\x2e\x32\x39\x34\x33\x20\x33\x2e\x35\x39\x37\
+\x39\x37\x20\x35\x38\x2e\x32\x31\x37\x35\x20\x32\x31\x2e\x37\x33\
+\x37\x38\x43\x20\x35\x38\x2e\x36\x37\x38\x38\x20\x33\x30\x2e\x38\
+\x30\x31\x39\x20\x35\x31\x2e\x31\x37\x38\x33\x20\x33\x37\x2e\x36\
+\x34\x34\x31\x20\x34\x32\x2e\x37\x34\x34\x35\x20\x34\x31\x2e\x37\
+\x31\x31\x39\x43\x20\x32\x37\x2e\x34\x36\x34\x36\x20\x34\x39\x2e\
+\x30\x38\x31\x38\x20\x39\x2e\x32\x36\x34\x35\x31\x20\x34\x36\x2e\
+\x30\x39\x36\x34\x20\x36\x2e\x30\x32\x32\x35\x20\x33\x32\x2e\x31\
+\x32\x5a\x27\x20\x66\x69\x6c\x6c\x3d\x27\x6e\x6f\x6e\x65\x27\x20\
+\x73\x74\x72\x6f\x6b\x65\x3d\x27\x23\x30\x30\x30\x30\x30\x30\x27\
+\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6c\x69\x6e\x65\x63\x61\x70\x3d\
+\x27\x72\x6f\x75\x6e\x64\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6c\
+\x69\x6e\x65\x6a\x6f\x69\x6e\x3d\x27\x72\x6f\x75\x6e\x64\x27\x20\
+\x73\x74\x72\x6f\x6b\x65\x2d\x6d\x69\x74\x65\x72\x6c\x69\x6d\x69\
+\x74\x3d\x27\x31\x30\x2e\x30\x33\x37\x35\x27\x20\x73\x74\x72\x6f\
+\x6b\x65\x2d\x77\x69\x64\x74\x68\x3d\x27\x32\x2e\x35\x30\x39\x33\
+\x37\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\x20\x74\x72\x61\
\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x74\x72\x61\x6e\x73\x6c\x61\x74\
\x65\x28\x35\x38\x2e\x34\x36\x36\x39\x20\x31\x31\x37\x2e\x38\x35\
\x38\x29\x73\x63\x61\x6c\x65\x28\x2e\x39\x39\x36\x32\x36\x34\x29\
-\x27\x3e\x0a\x3c\x63\x69\x72\x63\x6c\x65\x20\x63\x78\x3d\x27\x34\
-\x32\x2e\x37\x34\x34\x35\x27\x20\x63\x79\x3d\x27\x34\x31\x2e\x37\
-\x31\x31\x39\x27\x20\x66\x69\x6c\x6c\x3d\x27\x23\x66\x66\x30\x30\
-\x30\x30\x27\x20\x72\x3d\x27\x36\x2e\x30\x32\x32\x35\x27\x2f\x3e\
-\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\x67\
-\x3e\
-\x00\x00\x03\xd9\
-\x3c\
-\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
-\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
-\x2d\x38\x22\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\x72\
-\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\x20\x49\x6c\x6c\x75\
-\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x38\x2e\x31\x2e\x31\x2c\x20\
-\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\x50\x6c\x75\x67\x2d\
-\x49\x6e\x20\x2e\x20\x53\x56\x47\x20\x56\x65\x72\x73\x69\x6f\x6e\
-\x3a\x20\x36\x2e\x30\x30\x20\x42\x75\x69\x6c\x64\x20\x30\x29\x20\
-\x20\x2d\x2d\x3e\x0a\x3c\x21\x44\x4f\x43\x54\x59\x50\x45\x20\x73\
-\x76\x67\x20\x50\x55\x42\x4c\x49\x43\x20\x22\x2d\x2f\x2f\x57\x33\
-\x43\x2f\x2f\x44\x54\x44\x20\x53\x56\x47\x20\x31\x2e\x31\x2f\x2f\
-\x45\x4e\x22\x20\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\
-\x77\x33\x2e\x6f\x72\x67\x2f\x47\x72\x61\x70\x68\x69\x63\x73\x2f\
-\x53\x56\x47\x2f\x31\x2e\x31\x2f\x44\x54\x44\x2f\x73\x76\x67\x31\
-\x31\x2e\x64\x74\x64\x22\x3e\x0a\x3c\x73\x76\x67\x20\x76\x65\x72\
-\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\x3d\x22\x43\
-\x68\x65\x76\x72\x6f\x6e\x5f\x63\x69\x72\x63\x6c\x65\x64\x5f\x72\
-\x69\x67\x68\x74\x22\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\x74\x74\
-\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x32\
-\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\x6e\x73\x3a\x78\
-\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\
-\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\x78\x6c\x69\
-\x6e\x6b\x22\x0a\x09\x20\x78\x3d\x22\x30\x70\x78\x22\x20\x79\x3d\
-\x22\x30\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\
-\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x65\x6e\x61\x62\
-\x6c\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3d\x22\x6e\
-\x65\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\
-\x78\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\
-\x72\x76\x65\x22\x3e\x0a\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\
-\x72\x6d\x3d\x27\x6d\x61\x74\x72\x69\x78\x28\x32\x34\x20\x30\x20\
-\x30\x20\x32\x34\x20\x30\x20\x30\x29\x27\x3e\x0a\x3c\x70\x61\x74\
-\x68\x20\x64\x3d\x22\x4d\x31\x31\x2c\x31\x30\x4c\x38\x2e\x36\x39\
-\x38\x2c\x37\x2e\x34\x39\x34\x63\x2d\x30\x2e\x31\x39\x36\x2d\x30\
-\x2e\x31\x39\x38\x2d\x30\x2e\x31\x39\x36\x2d\x30\x2e\x35\x31\x39\
-\x2c\x30\x2d\x30\x2e\x37\x31\x38\x63\x30\x2e\x31\x39\x36\x2d\x30\
-\x2e\x31\x39\x37\x2c\x30\x2e\x35\x31\x35\x2d\x30\x2e\x31\x39\x37\
-\x2c\x30\x2e\x37\x31\x2c\x30\x6c\x32\x2e\x38\x30\x37\x2c\x32\x2e\
-\x38\x36\x34\x0a\x09\x63\x30\x2e\x31\x39\x36\x2c\x30\x2e\x31\x39\
-\x39\x2c\x30\x2e\x31\x39\x36\x2c\x30\x2e\x35\x32\x2c\x30\x2c\x30\
-\x2e\x37\x31\x37\x6c\x2d\x32\x2e\x38\x30\x37\x2c\x32\x2e\x38\x36\
-\x34\x63\x2d\x30\x2e\x31\x39\x35\x2c\x30\x2e\x31\x39\x39\x2d\x30\
-\x2e\x35\x31\x34\x2c\x30\x2e\x31\x39\x38\x2d\x30\x2e\x37\x31\x2c\
-\x30\x63\x2d\x30\x2e\x31\x39\x36\x2d\x30\x2e\x31\x39\x37\x2d\x30\
-\x2e\x31\x39\x36\x2d\x30\x2e\x35\x31\x38\x2c\x30\x2d\x30\x2e\x37\
-\x31\x37\x4c\x31\x31\x2c\x31\x30\x7a\x20\x4d\x31\x30\x2c\x30\x2e\
-\x34\x0a\x09\x63\x35\x2e\x33\x30\x32\x2c\x30\x2c\x39\x2e\x36\x2c\
-\x34\x2e\x32\x39\x38\x2c\x39\x2e\x36\x2c\x39\x2e\x36\x63\x30\x2c\
-\x35\x2e\x33\x30\x33\x2d\x34\x2e\x32\x39\x38\x2c\x39\x2e\x36\x2d\
-\x39\x2e\x36\x2c\x39\x2e\x36\x53\x30\x2e\x34\x2c\x31\x35\x2e\x33\
-\x30\x33\x2c\x30\x2e\x34\x2c\x31\x30\x43\x30\x2e\x34\x2c\x34\x2e\
-\x36\x39\x38\x2c\x34\x2e\x36\x39\x38\x2c\x30\x2e\x34\x2c\x31\x30\
-\x2c\x30\x2e\x34\x7a\x20\x4d\x31\x30\x2c\x31\x38\x2e\x33\x35\x34\
-\x0a\x09\x63\x34\x2e\x36\x31\x33\x2c\x30\x2c\x38\x2e\x33\x35\x34\
-\x2d\x33\x2e\x37\x34\x2c\x38\x2e\x33\x35\x34\x2d\x38\x2e\x33\x35\
-\x34\x63\x30\x2d\x34\x2e\x36\x31\x34\x2d\x33\x2e\x37\x34\x31\x2d\
-\x38\x2e\x33\x35\x34\x2d\x38\x2e\x33\x35\x34\x2d\x38\x2e\x33\x35\
-\x34\x63\x2d\x34\x2e\x36\x31\x35\x2c\x30\x2d\x38\x2e\x33\x35\x34\
-\x2c\x33\x2e\x37\x34\x2d\x38\x2e\x33\x35\x34\x2c\x38\x2e\x33\x35\
-\x34\x0a\x09\x43\x31\x2e\x36\x34\x35\x2c\x31\x34\x2e\x36\x31\x34\
-\x2c\x35\x2e\x33\x38\x35\x2c\x31\x38\x2e\x33\x35\x34\x2c\x31\x30\
-\x2c\x31\x38\x2e\x33\x35\x34\x7a\x22\x2f\x3e\x0a\x3c\x2f\x67\x3e\
-\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\
-\x00\x00\x04\xa3\
+\x27\x3e\x0a\x3c\x63\x69\x72\x63\x6c\x65\x20\x63\x78\x3d\x27\x36\
+\x2e\x30\x32\x32\x35\x27\x20\x63\x79\x3d\x27\x33\x32\x2e\x31\x32\
+\x27\x20\x66\x69\x6c\x6c\x3d\x27\x23\x66\x66\x30\x30\x30\x30\x27\
+\x20\x72\x3d\x27\x36\x2e\x30\x32\x32\x35\x27\x2f\x3e\x0a\x3c\x2f\
+\x67\x3e\x0a\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\
+\x27\x74\x72\x61\x6e\x73\x6c\x61\x74\x65\x28\x35\x38\x2e\x34\x36\
+\x36\x39\x20\x31\x31\x37\x2e\x38\x35\x38\x29\x73\x63\x61\x6c\x65\
+\x28\x2e\x39\x39\x36\x32\x36\x34\x29\x27\x3e\x0a\x3c\x63\x69\x72\
+\x63\x6c\x65\x20\x63\x78\x3d\x27\x31\x33\x2e\x39\x36\x38\x37\x27\
+\x20\x63\x79\x3d\x27\x31\x32\x2e\x39\x33\x36\x31\x27\x20\x66\x69\
+\x6c\x6c\x3d\x27\x23\x66\x66\x30\x30\x30\x30\x27\x20\x72\x3d\x27\
+\x36\x2e\x30\x32\x32\x35\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\
+\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x74\x72\x61\
+\x6e\x73\x6c\x61\x74\x65\x28\x35\x38\x2e\x34\x36\x36\x39\x20\x31\
+\x31\x37\x2e\x38\x35\x38\x29\x73\x63\x61\x6c\x65\x28\x2e\x39\x39\
+\x36\x32\x36\x34\x29\x27\x3e\x0a\x3c\x63\x69\x72\x63\x6c\x65\x20\
+\x63\x78\x3d\x27\x35\x38\x2e\x32\x31\x37\x35\x27\x20\x63\x79\x3d\
+\x27\x32\x31\x2e\x37\x33\x37\x38\x27\x20\x66\x69\x6c\x6c\x3d\x27\
+\x23\x66\x66\x30\x30\x30\x30\x27\x20\x72\x3d\x27\x36\x2e\x30\x32\
+\x32\x35\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\x20\x74\x72\
+\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x74\x72\x61\x6e\x73\x6c\x61\
+\x74\x65\x28\x35\x38\x2e\x34\x36\x36\x39\x20\x31\x31\x37\x2e\x38\
+\x35\x38\x29\x73\x63\x61\x6c\x65\x28\x2e\x39\x39\x36\x32\x36\x34\
+\x29\x27\x3e\x0a\x3c\x63\x69\x72\x63\x6c\x65\x20\x63\x78\x3d\x27\
+\x34\x32\x2e\x37\x34\x34\x35\x27\x20\x63\x79\x3d\x27\x34\x31\x2e\
+\x37\x31\x31\x39\x27\x20\x66\x69\x6c\x6c\x3d\x27\x23\x66\x66\x30\
+\x30\x30\x30\x27\x20\x72\x3d\x27\x36\x2e\x30\x32\x32\x35\x27\x2f\
+\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\
+\x67\x3e\
+\x00\x00\x04\x73\
\x3c\
\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x27\x31\x2e\
\x30\x27\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x27\x55\x54\x46\
@@ -583,19 +448,16 @@ qt_resource_data = b"\
\x31\x37\x2e\x38\x35\x38\x29\x73\x63\x61\x6c\x65\x28\x2e\x39\x39\
\x36\x32\x36\x34\x29\x27\x3e\x0a\x3c\x70\x61\x74\x68\x20\x64\x3d\
\x27\x4d\x20\x36\x2e\x30\x32\x32\x35\x20\x33\x32\x2e\x31\x32\x43\
-\x20\x34\x2e\x33\x35\x34\x33\x38\x20\x32\x34\x2e\x39\x32\x38\x37\
-\x20\x38\x2e\x34\x33\x32\x31\x37\x20\x31\x38\x2e\x30\x30\x31\x34\
+\x20\x36\x2e\x32\x32\x30\x37\x32\x20\x32\x34\x2e\x39\x36\x35\x35\
+\x20\x39\x2e\x30\x34\x39\x38\x39\x20\x31\x38\x2e\x31\x33\x35\x33\
\x20\x31\x33\x2e\x39\x36\x38\x37\x20\x31\x32\x2e\x39\x33\x36\x31\
-\x43\x20\x33\x31\x2e\x37\x33\x33\x39\x20\x2d\x33\x2e\x33\x31\x36\
-\x37\x35\x20\x35\x37\x2e\x32\x39\x34\x33\x20\x33\x2e\x35\x39\x37\
-\x39\x37\x20\x35\x38\x2e\x32\x31\x37\x35\x20\x32\x31\x2e\x37\x33\
-\x37\x38\x43\x20\x35\x38\x2e\x36\x37\x38\x38\x20\x33\x30\x2e\x38\
-\x30\x31\x39\x20\x35\x31\x2e\x31\x37\x38\x33\x20\x33\x37\x2e\x36\
-\x34\x34\x31\x20\x34\x32\x2e\x37\x34\x34\x35\x20\x34\x31\x2e\x37\
-\x31\x31\x39\x43\x20\x32\x37\x2e\x34\x36\x34\x36\x20\x34\x39\x2e\
-\x30\x38\x31\x38\x20\x39\x2e\x32\x36\x34\x35\x31\x20\x34\x36\x2e\
-\x30\x39\x36\x34\x20\x36\x2e\x30\x32\x32\x35\x20\x33\x32\x2e\x31\
-\x32\x5a\x27\x20\x66\x69\x6c\x6c\x3d\x27\x6e\x6f\x6e\x65\x27\x20\
+\x43\x20\x32\x39\x2e\x35\x30\x36\x32\x20\x2d\x33\x2e\x34\x38\x36\
+\x38\x36\x20\x35\x35\x2e\x33\x36\x37\x33\x20\x32\x2e\x36\x39\x39\
+\x35\x20\x35\x38\x2e\x32\x31\x37\x35\x20\x32\x31\x2e\x37\x33\x37\
+\x38\x43\x20\x35\x39\x2e\x36\x39\x32\x32\x20\x33\x31\x2e\x35\x38\
+\x38\x31\x20\x35\x32\x2e\x36\x35\x30\x38\x20\x34\x30\x2e\x36\x37\
+\x37\x39\x20\x34\x32\x2e\x37\x34\x34\x35\x20\x34\x31\x2e\x37\x31\
+\x31\x39\x27\x20\x66\x69\x6c\x6c\x3d\x27\x6e\x6f\x6e\x65\x27\x20\
\x73\x74\x72\x6f\x6b\x65\x3d\x27\x23\x30\x30\x30\x30\x30\x30\x27\
\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6c\x69\x6e\x65\x63\x61\x70\x3d\
\x27\x72\x6f\x75\x6e\x64\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6c\
@@ -636,7 +498,7 @@ qt_resource_data = b"\
\x30\x30\x30\x27\x20\x72\x3d\x27\x36\x2e\x30\x32\x32\x35\x27\x2f\
\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\
\x67\x3e\
-\x00\x00\x03\x03\
+\x00\x00\x04\x9c\
\x3c\
\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
@@ -654,97 +516,71 @@ qt_resource_data = b"\
\x53\x56\x47\x2f\x31\x2e\x31\x2f\x44\x54\x44\x2f\x73\x76\x67\x31\
\x31\x2e\x64\x74\x64\x22\x3e\x0a\x3c\x73\x76\x67\x20\x76\x65\x72\
\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\x3d\x22\x43\
-\x68\x65\x63\x6b\x22\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\x74\x74\
-\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x32\
-\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\x6e\x73\x3a\x78\
-\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\
-\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\x78\x6c\x69\
-\x6e\x6b\x22\x20\x78\x3d\x22\x30\x70\x78\x22\x20\x79\x3d\x22\x30\
-\x70\x78\x22\x0a\x09\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\
-\x20\x30\x20\x32\x30\x20\x32\x30\x22\x20\x65\x6e\x61\x62\x6c\x65\
-\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3d\x22\x6e\x65\x77\
-\x20\x30\x20\x30\x20\x32\x30\x20\x32\x30\x22\x20\x78\x6d\x6c\x3a\
-\x73\x70\x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\x72\x76\x65\x22\
-\x3e\x0a\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x38\x2e\x32\x39\
-\x34\x2c\x31\x36\x2e\x39\x39\x38\x63\x2d\x30\x2e\x34\x33\x35\x2c\
-\x30\x2d\x30\x2e\x38\x34\x37\x2d\x30\x2e\x32\x30\x33\x2d\x31\x2e\
-\x31\x31\x31\x2d\x30\x2e\x35\x35\x33\x4c\x33\x2e\x36\x31\x2c\x31\
-\x31\x2e\x37\x32\x34\x63\x2d\x30\x2e\x34\x36\x35\x2d\x30\x2e\x36\
-\x31\x33\x2d\x30\x2e\x33\x34\x34\x2d\x31\x2e\x34\x38\x36\x2c\x30\
-\x2e\x32\x37\x2d\x31\x2e\x39\x35\x31\x0a\x09\x63\x30\x2e\x36\x31\
-\x35\x2d\x30\x2e\x34\x36\x37\x2c\x31\x2e\x34\x38\x38\x2d\x30\x2e\
-\x33\x34\x34\x2c\x31\x2e\x39\x35\x33\x2c\x30\x2e\x32\x37\x6c\x32\
-\x2e\x33\x35\x31\x2c\x33\x2e\x31\x30\x34\x6c\x35\x2e\x39\x31\x31\
-\x2d\x39\x2e\x34\x39\x32\x63\x30\x2e\x34\x30\x37\x2d\x30\x2e\x36\
-\x35\x32\x2c\x31\x2e\x32\x36\x37\x2d\x30\x2e\x38\x35\x32\x2c\x31\
-\x2e\x39\x32\x31\x2d\x30\x2e\x34\x34\x35\x0a\x09\x63\x30\x2e\x36\
-\x35\x33\x2c\x30\x2e\x34\x30\x36\x2c\x30\x2e\x38\x35\x34\x2c\x31\
-\x2e\x32\x36\x36\x2c\x30\x2e\x34\x34\x36\x2c\x31\x2e\x39\x32\x4c\
-\x39\x2e\x34\x37\x38\x2c\x31\x36\x2e\x33\x34\x63\x2d\x30\x2e\x32\
-\x34\x32\x2c\x30\x2e\x33\x39\x31\x2d\x30\x2e\x36\x36\x31\x2c\x30\
-\x2e\x36\x33\x35\x2d\x31\x2e\x31\x32\x2c\x30\x2e\x36\x35\x36\x43\
-\x38\x2e\x33\x33\x36\x2c\x31\x36\x2e\x39\x39\x38\x2c\x38\x2e\x33\
-\x31\x36\x2c\x31\x36\x2e\x39\x39\x38\x2c\x38\x2e\x32\x39\x34\x2c\
-\x31\x36\x2e\x39\x39\x38\x7a\x22\x2f\x3e\x0a\x3c\x2f\x73\x76\x67\
-\x3e\x0a\
-\x00\x00\x02\x72\
-\x3c\
-\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
-\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
-\x2d\x38\x22\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\x72\
-\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\x20\x49\x6c\x6c\x75\
-\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x36\x2e\x32\x2e\x31\x2c\x20\
-\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\x50\x6c\x75\x67\x2d\
-\x49\x6e\x20\x2e\x20\x53\x56\x47\x20\x56\x65\x72\x73\x69\x6f\x6e\
-\x3a\x20\x36\x2e\x30\x30\x20\x42\x75\x69\x6c\x64\x20\x30\x29\x20\
-\x20\x2d\x2d\x3e\x0a\x3c\x21\x44\x4f\x43\x54\x59\x50\x45\x20\x73\
-\x76\x67\x20\x50\x55\x42\x4c\x49\x43\x20\x22\x2d\x2f\x2f\x57\x33\
-\x43\x2f\x2f\x44\x54\x44\x20\x53\x56\x47\x20\x31\x2e\x31\x2f\x2f\
-\x45\x4e\x22\x20\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\
-\x77\x33\x2e\x6f\x72\x67\x2f\x47\x72\x61\x70\x68\x69\x63\x73\x2f\
-\x53\x56\x47\x2f\x31\x2e\x31\x2f\x44\x54\x44\x2f\x73\x76\x67\x31\
-\x31\x2e\x64\x74\x64\x22\x3e\x0a\x3c\x73\x76\x67\x20\x76\x65\x72\
-\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\x3d\x22\x4c\
-\x61\x79\x65\x72\x5f\x31\x22\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\
-\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\
-\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\x6e\x73\
-\x3a\x78\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\
-\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\x78\
-\x6c\x69\x6e\x6b\x22\x20\x78\x3d\x22\x30\x70\x78\x22\x20\x79\x3d\
-\x22\x30\x70\x78\x22\x0a\x09\x20\x77\x69\x64\x74\x68\x3d\x22\x35\
-\x31\x32\x70\x78\x22\x20\x68\x65\x69\x67\x68\x74\x3d\x22\x35\x31\
-\x32\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\x20\
-\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x65\x6e\x61\x62\x6c\
-\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3d\x22\x6e\x65\
-\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x78\
-\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\x72\
-\x76\x65\x22\x3e\x0a\x3c\x67\x20\x69\x64\x3d\x22\x49\x63\x6f\x6e\
-\x5f\x38\x5f\x22\x3e\x0a\x09\x3c\x67\x3e\x0a\x09\x09\x3c\x70\x61\
-\x74\x68\x20\x64\x3d\x22\x4d\x34\x32\x37\x2c\x32\x33\x34\x2e\x36\
-\x32\x35\x48\x31\x36\x37\x2e\x32\x39\x36\x6c\x31\x31\x39\x2e\x37\
-\x30\x32\x2d\x31\x31\x39\x2e\x37\x30\x32\x4c\x32\x35\x36\x2c\x38\
-\x35\x4c\x38\x35\x2c\x32\x35\x36\x6c\x31\x37\x31\x2c\x31\x37\x31\
-\x6c\x32\x39\x2e\x39\x32\x32\x2d\x32\x39\x2e\x39\x32\x34\x4c\x31\
-\x36\x37\x2e\x32\x39\x36\x2c\x32\x37\x37\x2e\x33\x37\x35\x48\x34\
-\x32\x37\x56\x32\x33\x34\x2e\x36\x32\x35\x7a\x22\x2f\x3e\x0a\x09\
-\x3c\x2f\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\
-\x0a\
-\x00\x00\x00\x6c\
-\x3c\
-\x73\x76\x67\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\
-\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x32\x30\x30\
-\x30\x2f\x73\x76\x67\x22\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\
-\x30\x20\x30\x20\x32\x30\x20\x32\x30\x22\x3e\x3c\x70\x61\x74\x68\
-\x20\x64\x3d\x22\x4d\x31\x38\x20\x31\x32\x76\x31\x48\x38\x76\x35\
-\x6c\x2d\x36\x2d\x36\x20\x36\x2d\x36\x76\x35\x68\x38\x56\x32\x68\
-\x32\x7a\x22\x2f\x3e\x3c\x2f\x73\x76\x67\x3e\
-\x00\x00\x03\x2a\
+\x6f\x64\x65\x22\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\x74\x74\x70\
+\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x32\x30\
+\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\x6e\x73\x3a\x78\x6c\
+\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\
+\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\x78\x6c\x69\x6e\
+\x6b\x22\x20\x78\x3d\x22\x32\x34\x70\x78\x22\x20\x79\x3d\x22\x32\
+\x34\x70\x78\x22\x0a\x09\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\
+\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x65\x6e\x61\
+\x62\x6c\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3d\x22\
+\x6e\x65\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\
+\x20\x78\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\x65\x73\
+\x65\x72\x76\x65\x22\x3e\x0a\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\
+\x6f\x72\x6d\x3d\x27\x6d\x61\x74\x72\x69\x78\x28\x32\x34\x20\x30\
+\x20\x30\x20\x32\x34\x20\x30\x20\x30\x29\x27\x3e\x3c\x70\x61\x74\
+\x68\x20\x64\x3d\x22\x4d\x35\x2e\x37\x31\x39\x2c\x31\x34\x2e\x37\
+\x35\x63\x2d\x30\x2e\x32\x33\x36\x2c\x30\x2d\x30\x2e\x34\x37\x34\
+\x2d\x30\x2e\x30\x38\x33\x2d\x30\x2e\x36\x36\x34\x2d\x30\x2e\x32\
+\x35\x32\x4c\x2d\x30\x2e\x30\x30\x35\x2c\x31\x30\x6c\x35\x2e\x33\
+\x34\x31\x2d\x34\x2e\x37\x34\x38\x43\x35\x2e\x37\x34\x38\x2c\x34\
+\x2e\x38\x38\x37\x2c\x36\x2e\x33\x38\x2c\x34\x2e\x39\x32\x32\x2c\
+\x36\x2e\x37\x34\x37\x2c\x35\x2e\x33\x33\x35\x0a\x09\x63\x30\x2e\
+\x33\x36\x37\x2c\x30\x2e\x34\x31\x33\x2c\x30\x2e\x33\x33\x2c\x31\
+\x2e\x30\x34\x35\x2d\x30\x2e\x30\x38\x33\x2c\x31\x2e\x34\x31\x32\
+\x4c\x33\x2e\x30\x30\x35\x2c\x31\x30\x6c\x33\x2e\x33\x37\x38\x2c\
+\x33\x2e\x30\x30\x32\x63\x30\x2e\x34\x31\x33\x2c\x30\x2e\x33\x36\
+\x37\x2c\x30\x2e\x34\x35\x2c\x30\x2e\x39\x39\x39\x2c\x30\x2e\x30\
+\x38\x33\x2c\x31\x2e\x34\x31\x32\x0a\x09\x43\x36\x2e\x32\x36\x39\
+\x2c\x31\x34\x2e\x36\x33\x37\x2c\x35\x2e\x39\x39\x34\x2c\x31\x34\
+\x2e\x37\x35\x2c\x35\x2e\x37\x31\x39\x2c\x31\x34\x2e\x37\x35\x7a\
+\x20\x4d\x31\x34\x2e\x36\x36\x34\x2c\x31\x34\x2e\x37\x34\x38\x4c\
+\x32\x30\x2e\x30\x30\x35\x2c\x31\x30\x6c\x2d\x35\x2e\x30\x36\x2d\
+\x34\x2e\x34\x39\x38\x63\x2d\x30\x2e\x34\x31\x33\x2d\x30\x2e\x33\
+\x36\x37\x2d\x31\x2e\x30\x34\x35\x2d\x30\x2e\x33\x33\x2d\x31\x2e\
+\x34\x31\x31\x2c\x30\x2e\x30\x38\x33\x0a\x09\x63\x2d\x30\x2e\x33\
+\x36\x37\x2c\x30\x2e\x34\x31\x33\x2d\x30\x2e\x33\x33\x2c\x31\x2e\
+\x30\x34\x35\x2c\x30\x2e\x30\x38\x33\x2c\x31\x2e\x34\x31\x32\x4c\
+\x31\x36\x2e\x39\x39\x35\x2c\x31\x30\x6c\x2d\x33\x2e\x36\x35\x39\
+\x2c\x33\x2e\x32\x35\x32\x63\x2d\x30\x2e\x34\x31\x33\x2c\x30\x2e\
+\x33\x36\x37\x2d\x30\x2e\x34\x35\x2c\x30\x2e\x39\x39\x39\x2d\x30\
+\x2e\x30\x38\x33\x2c\x31\x2e\x34\x31\x32\x43\x31\x33\x2e\x34\x35\
+\x2c\x31\x34\x2e\x38\x38\x37\x2c\x31\x33\x2e\x37\x32\x35\x2c\x31\
+\x35\x2c\x31\x34\x2c\x31\x35\x0a\x09\x43\x31\x34\x2e\x32\x33\x36\
+\x2c\x31\x35\x2c\x31\x34\x2e\x34\x37\x34\x2c\x31\x34\x2e\x39\x31\
+\x37\x2c\x31\x34\x2e\x36\x36\x34\x2c\x31\x34\x2e\x37\x34\x38\x7a\
+\x20\x4d\x39\x2e\x39\x38\x36\x2c\x31\x36\x2e\x31\x36\x35\x6c\x32\
+\x2d\x31\x32\x63\x30\x2e\x30\x39\x31\x2d\x30\x2e\x35\x34\x35\x2d\
+\x30\x2e\x32\x37\x37\x2d\x31\x2e\x30\x36\x2d\x30\x2e\x38\x32\x32\
+\x2d\x31\x2e\x31\x35\x31\x0a\x09\x63\x2d\x30\x2e\x35\x34\x37\x2d\
+\x30\x2e\x30\x39\x32\x2d\x31\x2e\x30\x36\x31\x2c\x30\x2e\x32\x37\
+\x37\x2d\x31\x2e\x31\x35\x2c\x30\x2e\x38\x32\x32\x6c\x2d\x32\x2c\
+\x31\x32\x63\x2d\x30\x2e\x30\x39\x31\x2c\x30\x2e\x35\x34\x35\x2c\
+\x30\x2e\x32\x37\x37\x2c\x31\x2e\x30\x36\x2c\x30\x2e\x38\x32\x32\
+\x2c\x31\x2e\x31\x35\x31\x43\x38\x2e\x38\x39\x32\x2c\x31\x36\x2e\
+\x39\x39\x36\x2c\x38\x2e\x39\x34\x36\x2c\x31\x37\x2c\x39\x2e\x30\
+\x30\x31\x2c\x31\x37\x0a\x09\x43\x39\x2e\x34\x38\x31\x2c\x31\x37\
+\x2c\x39\x2e\x39\x30\x35\x2c\x31\x36\x2e\x36\x35\x33\x2c\x39\x2e\
+\x39\x38\x36\x2c\x31\x36\x2e\x31\x36\x35\x7a\x22\x2f\x3e\x0a\x3c\
+\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\
+\x00\x00\x03\xe8\
\x3c\
\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
\x2d\x38\x22\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\x72\
\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\x20\x49\x6c\x6c\x75\
-\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x36\x2e\x32\x2e\x31\x2c\x20\
+\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x38\x2e\x31\x2e\x31\x2c\x20\
\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\x50\x6c\x75\x67\x2d\
\x49\x6e\x20\x2e\x20\x53\x56\x47\x20\x56\x65\x72\x73\x69\x6f\x6e\
\x3a\x20\x36\x2e\x30\x30\x20\x42\x75\x69\x6c\x64\x20\x30\x29\x20\
@@ -755,63 +591,55 @@ qt_resource_data = b"\
\x77\x33\x2e\x6f\x72\x67\x2f\x47\x72\x61\x70\x68\x69\x63\x73\x2f\
\x53\x56\x47\x2f\x31\x2e\x31\x2f\x44\x54\x44\x2f\x73\x76\x67\x31\
\x31\x2e\x64\x74\x64\x22\x3e\x0a\x3c\x73\x76\x67\x20\x76\x65\x72\
-\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\x3d\x22\x4c\
-\x61\x79\x65\x72\x5f\x31\x22\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\
-\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\
-\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\x6e\x73\
-\x3a\x78\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\
-\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\x78\
-\x6c\x69\x6e\x6b\x22\x20\x78\x3d\x22\x30\x70\x78\x22\x20\x79\x3d\
-\x22\x30\x70\x78\x22\x0a\x09\x20\x77\x69\x64\x74\x68\x3d\x22\x35\
-\x31\x32\x70\x78\x22\x20\x68\x65\x69\x67\x68\x74\x3d\x22\x35\x31\
-\x32\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\x20\
+\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\x3d\x22\x43\
+\x68\x65\x76\x72\x6f\x6e\x5f\x63\x69\x72\x63\x6c\x65\x64\x5f\x6c\
+\x65\x66\x74\x22\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\x74\x74\x70\
+\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x32\x30\
+\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\x6e\x73\x3a\x78\x6c\
+\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\
+\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\x78\x6c\x69\x6e\
+\x6b\x22\x0a\x09\x20\x78\x3d\x22\x30\x70\x78\x22\x20\x79\x3d\x22\
+\x30\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\x20\
\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x65\x6e\x61\x62\x6c\
\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3d\x22\x6e\x65\
\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x78\
\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\x72\
-\x76\x65\x22\x3e\x0a\x3c\x67\x3e\x0a\x09\x3c\x70\x6f\x6c\x79\x67\
-\x6f\x6e\x20\x70\x6f\x69\x6e\x74\x73\x3d\x22\x33\x39\x36\x2e\x37\
-\x39\x35\x2c\x33\x39\x36\x2e\x38\x20\x33\x32\x30\x2c\x33\x39\x36\
-\x2e\x38\x20\x33\x32\x30\x2c\x34\x34\x38\x20\x34\x34\x38\x2c\x34\
-\x34\x38\x20\x34\x34\x38\x2c\x33\x32\x30\x20\x33\x39\x36\x2e\x37\
-\x39\x35\x2c\x33\x32\x30\x20\x09\x22\x2f\x3e\x0a\x09\x3c\x70\x6f\
-\x6c\x79\x67\x6f\x6e\x20\x70\x6f\x69\x6e\x74\x73\x3d\x22\x33\x39\
-\x36\x2e\x38\x2c\x31\x31\x35\x2e\x32\x30\x35\x20\x33\x39\x36\x2e\
-\x38\x2c\x31\x39\x32\x20\x34\x34\x38\x2c\x31\x39\x32\x20\x34\x34\
-\x38\x2c\x36\x34\x20\x33\x32\x30\x2c\x36\x34\x20\x33\x32\x30\x2c\
-\x31\x31\x35\x2e\x32\x30\x35\x20\x09\x22\x2f\x3e\x0a\x09\x3c\x70\
-\x6f\x6c\x79\x67\x6f\x6e\x20\x70\x6f\x69\x6e\x74\x73\x3d\x22\x31\
-\x31\x35\x2e\x32\x30\x35\x2c\x31\x31\x35\x2e\x32\x20\x31\x39\x32\
-\x2c\x31\x31\x35\x2e\x32\x20\x31\x39\x32\x2c\x36\x34\x20\x36\x34\
-\x2c\x36\x34\x20\x36\x34\x2c\x31\x39\x32\x20\x31\x31\x35\x2e\x32\
-\x30\x35\x2c\x31\x39\x32\x20\x09\x22\x2f\x3e\x0a\x09\x3c\x70\x6f\
-\x6c\x79\x67\x6f\x6e\x20\x70\x6f\x69\x6e\x74\x73\x3d\x22\x31\x31\
-\x35\x2e\x32\x2c\x33\x39\x36\x2e\x37\x39\x35\x20\x31\x31\x35\x2e\
-\x32\x2c\x33\x32\x30\x20\x36\x34\x2c\x33\x32\x30\x20\x36\x34\x2c\
-\x34\x34\x38\x20\x31\x39\x32\x2c\x34\x34\x38\x20\x31\x39\x32\x2c\
-\x33\x39\x36\x2e\x37\x39\x35\x20\x09\x22\x2f\x3e\x0a\x3c\x2f\x67\
-\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\
-\x00\x00\x01\x1c\
-\x3c\
-\x73\x76\x67\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\
-\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x32\x30\x30\
-\x30\x2f\x73\x76\x67\x22\x20\x77\x69\x64\x74\x68\x3d\x22\x35\x31\
-\x32\x70\x78\x22\x20\x68\x65\x69\x67\x68\x74\x3d\x22\x35\x31\x32\
-\x70\x78\x22\x0a\x20\x20\x20\x20\x20\x76\x69\x65\x77\x42\x6f\x78\
-\x3d\x22\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x3e\x0a\
-\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x6d\x61\
-\x74\x72\x69\x78\x28\x34\x38\x20\x30\x20\x30\x20\x34\x38\x20\x34\
-\x38\x20\x34\x38\x29\x27\x3e\x0a\x20\x20\x3c\x70\x61\x74\x68\x20\
-\x64\x3d\x22\x4d\x30\x20\x30\x76\x32\x68\x2e\x35\x63\x30\x2d\x2e\
-\x35\x35\x2e\x34\x35\x2d\x31\x20\x31\x2d\x31\x68\x31\x2e\x35\x76\
-\x35\x2e\x35\x63\x30\x20\x2e\x32\x38\x2d\x2e\x32\x32\x2e\x35\x2d\
-\x2e\x35\x2e\x35\x68\x2d\x2e\x35\x76\x31\x68\x34\x76\x2d\x31\x68\
-\x2d\x2e\x35\x63\x2d\x2e\x32\x38\x20\x30\x2d\x2e\x35\x2d\x2e\x32\
-\x32\x2d\x2e\x35\x2d\x2e\x35\x76\x2d\x35\x2e\x35\x68\x31\x2e\x35\
-\x63\x2e\x35\x35\x20\x30\x20\x31\x20\x2e\x34\x35\x20\x31\x20\x31\
-\x68\x2e\x35\x76\x2d\x32\x68\x2d\x38\x7a\x22\x20\x2f\x3e\x0a\x3c\
-\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\
-\x00\x00\x04\x54\
+\x76\x65\x22\x3e\x0a\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\
+\x6d\x3d\x27\x6d\x61\x74\x72\x69\x78\x28\x32\x34\x20\x30\x20\x30\
+\x20\x32\x34\x20\x30\x20\x30\x29\x27\x3e\x0a\x3c\x70\x61\x74\x68\
+\x20\x64\x3d\x22\x4d\x31\x31\x2e\x33\x30\x32\x2c\x36\x2e\x37\x37\
+\x36\x63\x2d\x30\x2e\x31\x39\x36\x2d\x30\x2e\x31\x39\x37\x2d\x30\
+\x2e\x35\x31\x35\x2d\x30\x2e\x31\x39\x37\x2d\x30\x2e\x37\x31\x2c\
+\x30\x4c\x37\x2e\x37\x38\x35\x2c\x39\x2e\x36\x34\x31\x63\x2d\x30\
+\x2e\x31\x39\x36\x2c\x30\x2e\x31\x39\x39\x2d\x30\x2e\x31\x39\x36\
+\x2c\x30\x2e\x35\x32\x2c\x30\x2c\x30\x2e\x37\x31\x37\x6c\x32\x2e\
+\x38\x30\x37\x2c\x32\x2e\x38\x36\x34\x0a\x09\x63\x30\x2e\x31\x39\
+\x35\x2c\x30\x2e\x31\x39\x39\x2c\x30\x2e\x35\x31\x34\x2c\x30\x2e\
+\x31\x39\x38\x2c\x30\x2e\x37\x31\x2c\x30\x63\x30\x2e\x31\x39\x36\
+\x2d\x30\x2e\x31\x39\x37\x2c\x30\x2e\x31\x39\x36\x2d\x30\x2e\x35\
+\x31\x38\x2c\x30\x2d\x30\x2e\x37\x31\x37\x4c\x39\x2c\x31\x30\x6c\
+\x32\x2e\x33\x30\x32\x2d\x32\x2e\x35\x30\x36\x43\x31\x31\x2e\x34\
+\x39\x38\x2c\x37\x2e\x32\x39\x36\x2c\x31\x31\x2e\x34\x39\x38\x2c\
+\x36\x2e\x39\x37\x36\x2c\x31\x31\x2e\x33\x30\x32\x2c\x36\x2e\x37\
+\x37\x36\x7a\x0a\x09\x20\x4d\x31\x30\x2c\x30\x2e\x34\x63\x2d\x35\
+\x2e\x33\x30\x32\x2c\x30\x2d\x39\x2e\x36\x2c\x34\x2e\x32\x39\x38\
+\x2d\x39\x2e\x36\x2c\x39\x2e\x36\x63\x30\x2c\x35\x2e\x33\x30\x33\
+\x2c\x34\x2e\x32\x39\x38\x2c\x39\x2e\x36\x2c\x39\x2e\x36\x2c\x39\
+\x2e\x36\x73\x39\x2e\x36\x2d\x34\x2e\x32\x39\x37\x2c\x39\x2e\x36\
+\x2d\x39\x2e\x36\x43\x31\x39\x2e\x36\x2c\x34\x2e\x36\x39\x38\x2c\
+\x31\x35\x2e\x33\x30\x32\x2c\x30\x2e\x34\x2c\x31\x30\x2c\x30\x2e\
+\x34\x7a\x20\x4d\x31\x30\x2c\x31\x38\x2e\x33\x35\x34\x0a\x09\x63\
+\x2d\x34\x2e\x36\x31\x35\x2c\x30\x2d\x38\x2e\x33\x35\x34\x2d\x33\
+\x2e\x37\x34\x2d\x38\x2e\x33\x35\x34\x2d\x38\x2e\x33\x35\x34\x63\
+\x30\x2d\x34\x2e\x36\x31\x34\x2c\x33\x2e\x37\x33\x39\x2d\x38\x2e\
+\x33\x35\x34\x2c\x38\x2e\x33\x35\x34\x2d\x38\x2e\x33\x35\x34\x63\
+\x34\x2e\x36\x31\x33\x2c\x30\x2c\x38\x2e\x33\x35\x34\x2c\x33\x2e\
+\x37\x34\x2c\x38\x2e\x33\x35\x34\x2c\x38\x2e\x33\x35\x34\x0a\x09\
+\x43\x31\x38\x2e\x33\x35\x34\x2c\x31\x34\x2e\x36\x31\x34\x2c\x31\
+\x34\x2e\x36\x31\x33\x2c\x31\x38\x2e\x33\x35\x34\x2c\x31\x30\x2c\
+\x31\x38\x2e\x33\x35\x34\x7a\x22\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\
+\x3c\x2f\x73\x76\x67\x3e\x0a\
+\x00\x00\x03\x5f\
\x3c\
\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
@@ -842,54 +670,38 @@ qt_resource_data = b"\
\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3d\x22\x6e\x65\
\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x78\
\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\x72\
-\x76\x65\x22\x3e\x0a\x3c\x67\x20\x69\x64\x3d\x22\x49\x63\x6f\x6e\
-\x22\x3e\x0a\x09\x3c\x67\x3e\x0a\x09\x09\x3c\x70\x61\x74\x68\x20\
-\x64\x3d\x22\x4d\x32\x35\x36\x2c\x31\x37\x36\x63\x2d\x34\x34\x2e\
-\x30\x30\x34\x2c\x30\x2d\x38\x30\x2e\x30\x30\x31\x2c\x33\x36\x2d\
-\x38\x30\x2e\x30\x30\x31\x2c\x38\x30\x63\x30\x2c\x34\x34\x2e\x30\
-\x30\x34\x2c\x33\x35\x2e\x39\x39\x37\x2c\x38\x30\x2c\x38\x30\x2e\
-\x30\x30\x31\x2c\x38\x30\x63\x34\x34\x2e\x30\x30\x35\x2c\x30\x2c\
-\x37\x39\x2e\x39\x39\x39\x2d\x33\x35\x2e\x39\x39\x36\x2c\x37\x39\
-\x2e\x39\x39\x39\x2d\x38\x30\x0a\x09\x09\x09\x43\x33\x33\x35\x2e\
-\x39\x39\x39\x2c\x32\x31\x32\x2c\x33\x30\x30\x2e\x30\x30\x35\x2c\
-\x31\x37\x36\x2c\x32\x35\x36\x2c\x31\x37\x36\x7a\x20\x4d\x34\x34\
-\x36\x2e\x39\x33\x38\x2c\x32\x33\x34\x2e\x36\x36\x37\x63\x2d\x39\
-\x2e\x36\x30\x35\x2d\x38\x38\x2e\x35\x33\x31\x2d\x38\x31\x2e\x30\
-\x37\x34\x2d\x31\x36\x30\x2d\x31\x36\x39\x2e\x36\x30\x35\x2d\x31\
-\x36\x39\x2e\x35\x39\x39\x56\x33\x32\x68\x2d\x34\x32\x2e\x36\x36\
-\x36\x76\x33\x33\x2e\x30\x36\x37\x0a\x09\x09\x09\x63\x2d\x38\x38\
-\x2e\x35\x33\x31\x2c\x39\x2e\x35\x39\x39\x2d\x31\x36\x30\x2c\x38\
-\x31\x2e\x30\x36\x38\x2d\x31\x36\x39\x2e\x36\x30\x34\x2c\x31\x36\
-\x39\x2e\x35\x39\x39\x48\x33\x32\x76\x34\x32\x2e\x36\x36\x37\x68\
-\x33\x33\x2e\x30\x36\x32\x63\x39\x2e\x36\x30\x34\x2c\x38\x38\x2e\
-\x35\x33\x31\x2c\x38\x31\x2e\x30\x37\x32\x2c\x31\x36\x30\x2c\x31\
-\x36\x39\x2e\x36\x30\x34\x2c\x31\x36\x39\x2e\x36\x30\x34\x56\x34\
-\x38\x30\x68\x34\x32\x2e\x36\x36\x36\x76\x2d\x33\x33\x2e\x30\x36\
-\x32\x0a\x09\x09\x09\x63\x38\x38\x2e\x35\x33\x31\x2d\x39\x2e\x36\
-\x30\x34\x2c\x31\x36\x30\x2d\x38\x31\x2e\x30\x37\x33\x2c\x31\x36\
-\x39\x2e\x36\x30\x35\x2d\x31\x36\x39\x2e\x36\x30\x34\x48\x34\x38\
-\x30\x76\x2d\x34\x32\x2e\x36\x36\x37\x48\x34\x34\x36\x2e\x39\x33\
-\x38\x7a\x20\x4d\x32\x35\x36\x2c\x34\x30\x35\x2e\x33\x33\x33\x63\
-\x2d\x38\x32\x2e\x31\x33\x37\x2c\x30\x2d\x31\x34\x39\x2e\x33\x33\
-\x34\x2d\x36\x37\x2e\x31\x39\x38\x2d\x31\x34\x39\x2e\x33\x33\x34\
-\x2d\x31\x34\x39\x2e\x33\x33\x33\x0a\x09\x09\x09\x63\x30\x2d\x38\
-\x32\x2e\x31\x33\x36\x2c\x36\x37\x2e\x31\x39\x37\x2d\x31\x34\x39\
-\x2e\x33\x33\x33\x2c\x31\x34\x39\x2e\x33\x33\x34\x2d\x31\x34\x39\
-\x2e\x33\x33\x33\x63\x38\x32\x2e\x31\x33\x35\x2c\x30\x2c\x31\x34\
-\x39\x2e\x33\x33\x32\x2c\x36\x37\x2e\x31\x39\x38\x2c\x31\x34\x39\
-\x2e\x33\x33\x32\x2c\x31\x34\x39\x2e\x33\x33\x33\x43\x34\x30\x35\
-\x2e\x33\x33\x32\x2c\x33\x33\x38\x2e\x31\x33\x35\x2c\x33\x33\x38\
-\x2e\x31\x33\x35\x2c\x34\x30\x35\x2e\x33\x33\x33\x2c\x32\x35\x36\
-\x2c\x34\x30\x35\x2e\x33\x33\x33\x7a\x0a\x09\x09\x09\x22\x2f\x3e\
-\x0a\x09\x3c\x2f\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\
-\x67\x3e\x0a\
-\x00\x00\x02\x72\
+\x76\x65\x22\x3e\x0a\x3c\x67\x3e\x0a\x09\x0a\x09\x09\x3c\x72\x65\
+\x63\x74\x20\x78\x3d\x22\x31\x37\x38\x2e\x38\x34\x36\x22\x20\x79\
+\x3d\x22\x39\x32\x2e\x30\x38\x37\x22\x20\x74\x72\x61\x6e\x73\x66\
+\x6f\x72\x6d\x3d\x22\x6d\x61\x74\x72\x69\x78\x28\x2d\x30\x2e\x37\
+\x30\x37\x31\x20\x2d\x30\x2e\x37\x30\x37\x31\x20\x30\x2e\x37\x30\
+\x37\x31\x20\x2d\x30\x2e\x37\x30\x37\x31\x20\x32\x32\x34\x2e\x33\
+\x34\x37\x36\x20\x36\x33\x31\x2e\x31\x34\x39\x38\x29\x22\x20\x77\
+\x69\x64\x74\x68\x3d\x22\x31\x32\x38\x2e\x30\x38\x35\x22\x20\x68\
+\x65\x69\x67\x68\x74\x3d\x22\x33\x35\x34\x2e\x30\x34\x39\x22\x2f\
+\x3e\x0a\x09\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x34\x37\x31\
+\x2e\x37\x32\x33\x2c\x38\x38\x2e\x33\x39\x33\x6c\x2d\x34\x38\x2e\
+\x31\x31\x35\x2d\x34\x38\x2e\x31\x31\x34\x63\x2d\x31\x31\x2e\x37\
+\x32\x33\x2d\x31\x31\x2e\x37\x32\x34\x2d\x33\x31\x2e\x35\x35\x38\
+\x2d\x31\x30\x2e\x38\x39\x36\x2d\x34\x34\x2e\x33\x30\x34\x2c\x31\
+\x2e\x38\x35\x6c\x2d\x34\x35\x2e\x32\x30\x32\x2c\x34\x35\x2e\x32\
+\x30\x33\x6c\x39\x30\x2e\x35\x36\x39\x2c\x39\x30\x2e\x35\x36\x38\
+\x6c\x34\x35\x2e\x32\x30\x32\x2d\x34\x35\x2e\x32\x30\x32\x0a\x09\
+\x09\x43\x34\x38\x32\x2e\x36\x31\x36\x2c\x31\x31\x39\x2e\x39\x35\
+\x32\x2c\x34\x38\x33\x2e\x34\x34\x35\x2c\x31\x30\x30\x2e\x31\x31\
+\x36\x2c\x34\x37\x31\x2e\x37\x32\x33\x2c\x38\x38\x2e\x33\x39\x33\
+\x7a\x22\x2f\x3e\x0a\x09\x3c\x70\x6f\x6c\x79\x67\x6f\x6e\x20\x70\
+\x6f\x69\x6e\x74\x73\x3d\x22\x36\x34\x2e\x30\x32\x31\x2c\x33\x36\
+\x33\x2e\x32\x35\x32\x20\x33\x32\x2c\x34\x38\x30\x20\x31\x34\x38\
+\x2e\x37\x33\x37\x2c\x34\x34\x37\x2e\x39\x37\x39\x20\x09\x22\x2f\
+\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\
+\x00\x00\x04\xca\
\x3c\
\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
\x2d\x38\x22\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\x72\
\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\x20\x49\x6c\x6c\x75\
-\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x36\x2e\x32\x2e\x31\x2c\x20\
+\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x39\x2e\x32\x2e\x31\x2c\x20\
\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\x50\x6c\x75\x67\x2d\
\x49\x6e\x20\x2e\x20\x53\x56\x47\x20\x56\x65\x72\x73\x69\x6f\x6e\
\x3a\x20\x36\x2e\x30\x30\x20\x42\x75\x69\x6c\x64\x20\x30\x29\x20\
@@ -900,32 +712,69 @@ qt_resource_data = b"\
\x77\x33\x2e\x6f\x72\x67\x2f\x47\x72\x61\x70\x68\x69\x63\x73\x2f\
\x53\x56\x47\x2f\x31\x2e\x31\x2f\x44\x54\x44\x2f\x73\x76\x67\x31\
\x31\x2e\x64\x74\x64\x22\x3e\x0a\x3c\x73\x76\x67\x20\x76\x65\x72\
-\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\x3d\x22\x4c\
-\x61\x79\x65\x72\x5f\x31\x22\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\
-\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\
-\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\x6e\x73\
-\x3a\x78\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\
-\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\x78\
-\x6c\x69\x6e\x6b\x22\x20\x78\x3d\x22\x30\x70\x78\x22\x20\x79\x3d\
-\x22\x30\x70\x78\x22\x0a\x09\x20\x77\x69\x64\x74\x68\x3d\x22\x35\
-\x31\x32\x70\x78\x22\x20\x68\x65\x69\x67\x68\x74\x3d\x22\x35\x31\
-\x32\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\x20\
-\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x65\x6e\x61\x62\x6c\
-\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3d\x22\x6e\x65\
-\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x78\
-\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\x72\
-\x76\x65\x22\x3e\x0a\x3c\x67\x20\x69\x64\x3d\x22\x49\x63\x6f\x6e\
-\x5f\x38\x5f\x22\x3e\x0a\x09\x3c\x67\x3e\x0a\x09\x09\x3c\x70\x61\
-\x74\x68\x20\x64\x3d\x22\x4d\x38\x35\x2c\x32\x37\x37\x2e\x33\x37\
-\x35\x68\x32\x35\x39\x2e\x37\x30\x34\x4c\x32\x32\x35\x2e\x30\x30\
-\x32\x2c\x33\x39\x37\x2e\x30\x37\x37\x4c\x32\x35\x36\x2c\x34\x32\
-\x37\x6c\x31\x37\x31\x2d\x31\x37\x31\x4c\x32\x35\x36\x2c\x38\x35\
-\x6c\x2d\x32\x39\x2e\x39\x32\x32\x2c\x32\x39\x2e\x39\x32\x34\x6c\
-\x31\x31\x38\x2e\x36\x32\x36\x2c\x31\x31\x39\x2e\x37\x30\x31\x48\
-\x38\x35\x56\x32\x37\x37\x2e\x33\x37\x35\x7a\x22\x2f\x3e\x0a\x09\
-\x3c\x2f\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\
-\x0a\
-\x00\x00\x04\x13\
+\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x0a\x09\x20\x69\x64\x3d\
+\x22\x73\x76\x67\x34\x36\x31\x39\x22\x20\x69\x6e\x6b\x73\x63\x61\
+\x70\x65\x3a\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x30\x2e\x39\x31\
+\x2b\x64\x65\x76\x65\x6c\x2b\x6f\x73\x78\x6d\x65\x6e\x75\x20\x72\
+\x31\x32\x39\x31\x31\x22\x20\x73\x6f\x64\x69\x70\x6f\x64\x69\x3a\
+\x64\x6f\x63\x6e\x61\x6d\x65\x3d\x22\x74\x72\x69\x61\x6e\x67\x6c\
+\x65\x2d\x73\x74\x72\x6f\x6b\x65\x64\x2d\x31\x35\x2e\x73\x76\x67\
+\x22\x20\x78\x6d\x6c\x6e\x73\x3a\x63\x63\x3d\x22\x68\x74\x74\x70\
+\x3a\x2f\x2f\x63\x72\x65\x61\x74\x69\x76\x65\x63\x6f\x6d\x6d\x6f\
+\x6e\x73\x2e\x6f\x72\x67\x2f\x6e\x73\x23\x22\x20\x78\x6d\x6c\x6e\
+\x73\x3a\x64\x63\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x70\x75\x72\
+\x6c\x2e\x6f\x72\x67\x2f\x64\x63\x2f\x65\x6c\x65\x6d\x65\x6e\x74\
+\x73\x2f\x31\x2e\x31\x2f\x22\x20\x78\x6d\x6c\x6e\x73\x3a\x69\x6e\
+\x6b\x73\x63\x61\x70\x65\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\
+\x77\x77\x2e\x69\x6e\x6b\x73\x63\x61\x70\x65\x2e\x6f\x72\x67\x2f\
+\x6e\x61\x6d\x65\x73\x70\x61\x63\x65\x73\x2f\x69\x6e\x6b\x73\x63\
+\x61\x70\x65\x22\x20\x78\x6d\x6c\x6e\x73\x3a\x72\x64\x66\x3d\x22\
+\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\
+\x67\x2f\x31\x39\x39\x39\x2f\x30\x32\x2f\x32\x32\x2d\x72\x64\x66\
+\x2d\x73\x79\x6e\x74\x61\x78\x2d\x6e\x73\x23\x22\x20\x78\x6d\x6c\
+\x6e\x73\x3a\x73\x6f\x64\x69\x70\x6f\x64\x69\x3d\x22\x68\x74\x74\
+\x70\x3a\x2f\x2f\x73\x6f\x64\x69\x70\x6f\x64\x69\x2e\x73\x6f\x75\
+\x72\x63\x65\x66\x6f\x72\x67\x65\x2e\x6e\x65\x74\x2f\x44\x54\x44\
+\x2f\x73\x6f\x64\x69\x70\x6f\x64\x69\x2d\x30\x2e\x64\x74\x64\x22\
+\x20\x78\x6d\x6c\x6e\x73\x3a\x73\x76\x67\x3d\x22\x68\x74\x74\x70\
+\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x32\x30\
+\x30\x30\x2f\x73\x76\x67\x22\x0a\x09\x20\x78\x6d\x6c\x6e\x73\x3d\
+\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\
+\x72\x67\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\
+\x6e\x73\x3a\x78\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\
+\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\
+\x2f\x78\x6c\x69\x6e\x6b\x22\x20\x78\x3d\x22\x30\x70\x78\x22\x20\
+\x79\x3d\x22\x30\x70\x78\x22\x20\x77\x69\x64\x74\x68\x3d\x22\x36\
+\x34\x70\x78\x22\x20\x68\x65\x69\x67\x68\x74\x3d\x22\x36\x34\x70\
+\x78\x22\x0a\x09\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\x20\
+\x30\x20\x31\x35\x20\x31\x35\x22\x20\x73\x74\x79\x6c\x65\x3d\x22\
+\x65\x6e\x61\x62\x6c\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\
+\x64\x3a\x6e\x65\x77\x20\x30\x20\x30\x20\x31\x35\x20\x31\x35\x3b\
+\x22\x20\x78\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\x65\
+\x73\x65\x72\x76\x65\x22\x3e\x0a\x3c\x70\x61\x74\x68\x20\x69\x64\
+\x3d\x22\x72\x65\x63\x74\x33\x33\x33\x38\x22\x20\x69\x6e\x6b\x73\
+\x63\x61\x70\x65\x3a\x63\x6f\x6e\x6e\x65\x63\x74\x6f\x72\x2d\x63\
+\x75\x72\x76\x61\x74\x75\x72\x65\x3d\x22\x30\x22\x20\x73\x6f\x64\
+\x69\x70\x6f\x64\x69\x3a\x6e\x6f\x64\x65\x74\x79\x70\x65\x73\x3d\
+\x22\x63\x63\x63\x63\x63\x63\x63\x63\x63\x63\x63\x63\x22\x20\x64\
+\x3d\x22\x4d\x37\x2e\x35\x32\x34\x33\x2c\x31\x2e\x35\x30\x30\x34\
+\x0a\x09\x43\x37\x2e\x32\x34\x32\x39\x2c\x31\x2e\x34\x39\x31\x33\
+\x2c\x36\x2e\x39\x37\x38\x37\x2c\x31\x2e\x36\x34\x32\x33\x2c\x36\
+\x2e\x38\x33\x33\x36\x2c\x31\x2e\x38\x39\x35\x32\x6c\x2d\x35\x2e\
+\x35\x2c\x39\x2e\x38\x36\x39\x32\x43\x31\x2e\x30\x32\x31\x38\x2c\
+\x31\x32\x2e\x33\x30\x37\x38\x2c\x31\x2e\x33\x39\x35\x2c\x31\x32\
+\x2e\x39\x39\x39\x39\x2c\x32\x2c\x31\x33\x68\x31\x31\x0a\x09\x63\
+\x30\x2e\x36\x30\x35\x2d\x30\x2e\x30\x30\x30\x31\x2c\x30\x2e\x39\
+\x37\x38\x32\x2d\x30\x2e\x36\x39\x32\x32\x2c\x30\x2e\x36\x36\x36\
+\x34\x2d\x31\x2e\x32\x33\x35\x35\x6c\x2d\x35\x2e\x35\x2d\x39\x2e\
+\x38\x36\x39\x32\x43\x38\x2e\x30\x33\x30\x32\x2c\x31\x2e\x36\x35\
+\x37\x39\x2c\x37\x2e\x37\x38\x38\x34\x2c\x31\x2e\x35\x30\x39\x32\
+\x2c\x37\x2e\x35\x32\x34\x33\x2c\x31\x2e\x35\x30\x30\x34\x7a\x20\
+\x4d\x37\x2e\x35\x2c\x33\x2e\x38\x39\x39\x33\x6c\x34\x2e\x31\x32\
+\x36\x37\x2c\x37\x2e\x34\x37\x30\x34\x0a\x09\x48\x33\x2e\x33\x37\
+\x33\x33\x4c\x37\x2e\x35\x2c\x33\x2e\x38\x39\x39\x33\x7a\x22\x2f\
+\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\
+\x00\x00\x04\x22\
\x3c\
\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x27\x31\x2e\
\x30\x27\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x27\x55\x54\x46\
@@ -952,155 +801,48 @@ qt_resource_data = b"\
\x20\x31\x33\x2e\x39\x36\x38\x37\x20\x31\x32\x2e\x39\x33\x36\x31\
\x4c\x20\x35\x38\x2e\x32\x31\x37\x35\x20\x32\x31\x2e\x37\x33\x37\
\x38\x4c\x20\x34\x32\x2e\x37\x34\x34\x35\x20\x34\x31\x2e\x37\x31\
-\x31\x39\x27\x20\x66\x69\x6c\x6c\x3d\x27\x6e\x6f\x6e\x65\x27\x20\
-\x73\x74\x72\x6f\x6b\x65\x3d\x27\x23\x30\x30\x30\x30\x30\x30\x27\
-\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6c\x69\x6e\x65\x63\x61\x70\x3d\
-\x27\x72\x6f\x75\x6e\x64\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6c\
-\x69\x6e\x65\x6a\x6f\x69\x6e\x3d\x27\x72\x6f\x75\x6e\x64\x27\x20\
-\x73\x74\x72\x6f\x6b\x65\x2d\x6d\x69\x74\x65\x72\x6c\x69\x6d\x69\
-\x74\x3d\x27\x31\x30\x2e\x30\x33\x37\x35\x27\x20\x73\x74\x72\x6f\
-\x6b\x65\x2d\x77\x69\x64\x74\x68\x3d\x27\x32\x2e\x35\x30\x39\x33\
-\x37\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\x20\x74\x72\x61\
+\x31\x39\x4c\x20\x36\x2e\x30\x32\x32\x35\x20\x33\x32\x2e\x31\x32\
+\x5a\x27\x20\x66\x69\x6c\x6c\x3d\x27\x6e\x6f\x6e\x65\x27\x20\x73\
+\x74\x72\x6f\x6b\x65\x3d\x27\x23\x30\x30\x30\x30\x30\x30\x27\x20\
+\x73\x74\x72\x6f\x6b\x65\x2d\x6c\x69\x6e\x65\x63\x61\x70\x3d\x27\
+\x72\x6f\x75\x6e\x64\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6c\x69\
+\x6e\x65\x6a\x6f\x69\x6e\x3d\x27\x72\x6f\x75\x6e\x64\x27\x20\x73\
+\x74\x72\x6f\x6b\x65\x2d\x6d\x69\x74\x65\x72\x6c\x69\x6d\x69\x74\
+\x3d\x27\x31\x30\x2e\x30\x33\x37\x35\x27\x20\x73\x74\x72\x6f\x6b\
+\x65\x2d\x77\x69\x64\x74\x68\x3d\x27\x32\x2e\x35\x30\x39\x33\x37\
+\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\x20\x74\x72\x61\x6e\
+\x73\x66\x6f\x72\x6d\x3d\x27\x74\x72\x61\x6e\x73\x6c\x61\x74\x65\
+\x28\x35\x38\x2e\x34\x36\x36\x39\x20\x31\x31\x37\x2e\x38\x35\x38\
+\x29\x73\x63\x61\x6c\x65\x28\x2e\x39\x39\x36\x32\x36\x34\x29\x27\
+\x3e\x0a\x3c\x63\x69\x72\x63\x6c\x65\x20\x63\x78\x3d\x27\x36\x2e\
+\x30\x32\x32\x35\x27\x20\x63\x79\x3d\x27\x33\x32\x2e\x31\x32\x27\
+\x20\x66\x69\x6c\x6c\x3d\x27\x23\x66\x66\x30\x30\x30\x30\x27\x20\
+\x72\x3d\x27\x36\x2e\x30\x32\x32\x35\x27\x2f\x3e\x0a\x3c\x2f\x67\
+\x3e\x0a\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\
+\x74\x72\x61\x6e\x73\x6c\x61\x74\x65\x28\x35\x38\x2e\x34\x36\x36\
+\x39\x20\x31\x31\x37\x2e\x38\x35\x38\x29\x73\x63\x61\x6c\x65\x28\
+\x2e\x39\x39\x36\x32\x36\x34\x29\x27\x3e\x0a\x3c\x63\x69\x72\x63\
+\x6c\x65\x20\x63\x78\x3d\x27\x31\x33\x2e\x39\x36\x38\x37\x27\x20\
+\x63\x79\x3d\x27\x31\x32\x2e\x39\x33\x36\x31\x27\x20\x66\x69\x6c\
+\x6c\x3d\x27\x23\x66\x66\x30\x30\x30\x30\x27\x20\x72\x3d\x27\x36\
+\x2e\x30\x32\x32\x35\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\
+\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x74\x72\x61\x6e\
+\x73\x6c\x61\x74\x65\x28\x35\x38\x2e\x34\x36\x36\x39\x20\x31\x31\
+\x37\x2e\x38\x35\x38\x29\x73\x63\x61\x6c\x65\x28\x2e\x39\x39\x36\
+\x32\x36\x34\x29\x27\x3e\x0a\x3c\x63\x69\x72\x63\x6c\x65\x20\x63\
+\x78\x3d\x27\x35\x38\x2e\x32\x31\x37\x35\x27\x20\x63\x79\x3d\x27\
+\x32\x31\x2e\x37\x33\x37\x38\x27\x20\x66\x69\x6c\x6c\x3d\x27\x23\
+\x66\x66\x30\x30\x30\x30\x27\x20\x72\x3d\x27\x36\x2e\x30\x32\x32\
+\x35\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\x20\x74\x72\x61\
\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x74\x72\x61\x6e\x73\x6c\x61\x74\
\x65\x28\x35\x38\x2e\x34\x36\x36\x39\x20\x31\x31\x37\x2e\x38\x35\
\x38\x29\x73\x63\x61\x6c\x65\x28\x2e\x39\x39\x36\x32\x36\x34\x29\
-\x27\x3e\x0a\x3c\x63\x69\x72\x63\x6c\x65\x20\x63\x78\x3d\x27\x36\
-\x2e\x30\x32\x32\x35\x27\x20\x63\x79\x3d\x27\x33\x32\x2e\x31\x32\
-\x27\x20\x66\x69\x6c\x6c\x3d\x27\x23\x66\x66\x30\x30\x30\x30\x27\
-\x20\x72\x3d\x27\x36\x2e\x30\x32\x32\x35\x27\x2f\x3e\x0a\x3c\x2f\
-\x67\x3e\x0a\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\
-\x27\x74\x72\x61\x6e\x73\x6c\x61\x74\x65\x28\x35\x38\x2e\x34\x36\
-\x36\x39\x20\x31\x31\x37\x2e\x38\x35\x38\x29\x73\x63\x61\x6c\x65\
-\x28\x2e\x39\x39\x36\x32\x36\x34\x29\x27\x3e\x0a\x3c\x63\x69\x72\
-\x63\x6c\x65\x20\x63\x78\x3d\x27\x31\x33\x2e\x39\x36\x38\x37\x27\
-\x20\x63\x79\x3d\x27\x31\x32\x2e\x39\x33\x36\x31\x27\x20\x66\x69\
-\x6c\x6c\x3d\x27\x23\x66\x66\x30\x30\x30\x30\x27\x20\x72\x3d\x27\
-\x36\x2e\x30\x32\x32\x35\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\
-\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x74\x72\x61\
-\x6e\x73\x6c\x61\x74\x65\x28\x35\x38\x2e\x34\x36\x36\x39\x20\x31\
-\x31\x37\x2e\x38\x35\x38\x29\x73\x63\x61\x6c\x65\x28\x2e\x39\x39\
-\x36\x32\x36\x34\x29\x27\x3e\x0a\x3c\x63\x69\x72\x63\x6c\x65\x20\
-\x63\x78\x3d\x27\x35\x38\x2e\x32\x31\x37\x35\x27\x20\x63\x79\x3d\
-\x27\x32\x31\x2e\x37\x33\x37\x38\x27\x20\x66\x69\x6c\x6c\x3d\x27\
-\x23\x66\x66\x30\x30\x30\x30\x27\x20\x72\x3d\x27\x36\x2e\x30\x32\
-\x32\x35\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\x20\x74\x72\
-\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x74\x72\x61\x6e\x73\x6c\x61\
-\x74\x65\x28\x35\x38\x2e\x34\x36\x36\x39\x20\x31\x31\x37\x2e\x38\
-\x35\x38\x29\x73\x63\x61\x6c\x65\x28\x2e\x39\x39\x36\x32\x36\x34\
-\x29\x27\x3e\x0a\x3c\x63\x69\x72\x63\x6c\x65\x20\x63\x78\x3d\x27\
-\x34\x32\x2e\x37\x34\x34\x35\x27\x20\x63\x79\x3d\x27\x34\x31\x2e\
-\x37\x31\x31\x39\x27\x20\x66\x69\x6c\x6c\x3d\x27\x23\x66\x66\x30\
-\x30\x30\x30\x27\x20\x72\x3d\x27\x36\x2e\x30\x32\x32\x35\x27\x2f\
-\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\
-\x67\x3e\
-\x00\x00\x03\xdc\
-\x3c\
-\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
-\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
-\x2d\x38\x22\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\x72\
-\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\x20\x49\x6c\x6c\x75\
-\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x36\x2e\x32\x2e\x31\x2c\x20\
-\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\x50\x6c\x75\x67\x2d\
-\x49\x6e\x20\x2e\x20\x53\x56\x47\x20\x56\x65\x72\x73\x69\x6f\x6e\
-\x3a\x20\x36\x2e\x30\x30\x20\x42\x75\x69\x6c\x64\x20\x30\x29\x20\
-\x20\x2d\x2d\x3e\x0a\x3c\x21\x44\x4f\x43\x54\x59\x50\x45\x20\x73\
-\x76\x67\x20\x50\x55\x42\x4c\x49\x43\x20\x22\x2d\x2f\x2f\x57\x33\
-\x43\x2f\x2f\x44\x54\x44\x20\x53\x56\x47\x20\x31\x2e\x31\x2f\x2f\
-\x45\x4e\x22\x20\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\
-\x77\x33\x2e\x6f\x72\x67\x2f\x47\x72\x61\x70\x68\x69\x63\x73\x2f\
-\x53\x56\x47\x2f\x31\x2e\x31\x2f\x44\x54\x44\x2f\x73\x76\x67\x31\
-\x31\x2e\x64\x74\x64\x22\x3e\x0a\x3c\x73\x76\x67\x20\x76\x65\x72\
-\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\x3d\x22\x4c\
-\x61\x79\x65\x72\x5f\x31\x22\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\
-\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\
-\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\x6e\x73\
-\x3a\x78\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\
-\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\x78\
-\x6c\x69\x6e\x6b\x22\x20\x78\x3d\x22\x30\x70\x78\x22\x20\x79\x3d\
-\x22\x30\x70\x78\x22\x0a\x09\x20\x77\x69\x64\x74\x68\x3d\x22\x35\
-\x31\x32\x70\x78\x22\x20\x68\x65\x69\x67\x68\x74\x3d\x22\x35\x31\
-\x32\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\x20\
-\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x73\x74\x79\x6c\x65\
-\x3d\x22\x65\x6e\x61\x62\x6c\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\
-\x75\x6e\x64\x3a\x6e\x65\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\
-\x35\x31\x32\x3b\x22\x20\x78\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\
-\x22\x70\x72\x65\x73\x65\x72\x76\x65\x22\x3e\x0a\x3c\x67\x3e\x0a\
-\x09\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x32\x35\x36\x2c\x31\
-\x32\x38\x63\x2d\x38\x31\x2e\x39\x2c\x30\x2d\x31\x34\x35\x2e\x37\
-\x2c\x34\x38\x2e\x38\x2d\x32\x32\x34\x2c\x31\x32\x38\x63\x36\x37\
-\x2e\x34\x2c\x36\x37\x2e\x37\x2c\x31\x32\x34\x2c\x31\x32\x38\x2c\
-\x32\x32\x34\x2c\x31\x32\x38\x63\x39\x39\x2e\x39\x2c\x30\x2c\x31\
-\x37\x33\x2e\x34\x2d\x37\x36\x2e\x34\x2c\x32\x32\x34\x2d\x31\x32\
-\x36\x2e\x36\x0a\x09\x09\x43\x34\x32\x38\x2e\x32\x2c\x31\x39\x38\
-\x2e\x36\x2c\x33\x35\x34\x2e\x38\x2c\x31\x32\x38\x2c\x32\x35\x36\
-\x2c\x31\x32\x38\x7a\x20\x4d\x32\x35\x36\x2c\x33\x34\x37\x2e\x33\
-\x63\x2d\x34\x39\x2e\x34\x2c\x30\x2d\x38\x39\x2e\x36\x2d\x34\x31\
-\x2d\x38\x39\x2e\x36\x2d\x39\x31\x2e\x33\x63\x30\x2d\x35\x30\x2e\
-\x34\x2c\x34\x30\x2e\x32\x2d\x39\x31\x2e\x33\x2c\x38\x39\x2e\x36\
-\x2d\x39\x31\x2e\x33\x73\x38\x39\x2e\x36\x2c\x34\x31\x2c\x38\x39\
-\x2e\x36\x2c\x39\x31\x2e\x33\x0a\x09\x09\x43\x33\x34\x35\x2e\x36\
-\x2c\x33\x30\x36\x2e\x34\x2c\x33\x30\x35\x2e\x34\x2c\x33\x34\x37\
-\x2e\x33\x2c\x32\x35\x36\x2c\x33\x34\x37\x2e\x33\x7a\x22\x2f\x3e\
-\x0a\x09\x3c\x67\x3e\x0a\x09\x09\x3c\x70\x61\x74\x68\x20\x64\x3d\
-\x22\x4d\x32\x35\x36\x2c\x32\x32\x34\x63\x30\x2d\x37\x2e\x39\x2c\
-\x32\x2e\x39\x2d\x31\x35\x2e\x31\x2c\x37\x2e\x36\x2d\x32\x30\x2e\
-\x37\x63\x2d\x32\x2e\x35\x2d\x30\x2e\x34\x2d\x35\x2d\x30\x2e\x36\
-\x2d\x37\x2e\x36\x2d\x30\x2e\x36\x63\x2d\x32\x38\x2e\x38\x2c\x30\
-\x2d\x35\x32\x2e\x33\x2c\x32\x33\x2e\x39\x2d\x35\x32\x2e\x33\x2c\
-\x35\x33\x2e\x33\x63\x30\x2c\x32\x39\x2e\x34\x2c\x32\x33\x2e\x35\
-\x2c\x35\x33\x2e\x33\x2c\x35\x32\x2e\x33\x2c\x35\x33\x2e\x33\x0a\
-\x09\x09\x09\x73\x35\x32\x2e\x33\x2d\x32\x33\x2e\x39\x2c\x35\x32\
-\x2e\x33\x2d\x35\x33\x2e\x33\x63\x30\x2d\x32\x2e\x33\x2d\x30\x2e\
-\x32\x2d\x34\x2e\x36\x2d\x30\x2e\x34\x2d\x36\x2e\x39\x63\x2d\x35\
-\x2e\x35\x2c\x34\x2e\x33\x2d\x31\x32\x2e\x33\x2c\x36\x2e\x39\x2d\
-\x31\x39\x2e\x38\x2c\x36\x2e\x39\x43\x32\x37\x30\x2e\x33\x2c\x32\
-\x35\x36\x2c\x32\x35\x36\x2c\x32\x34\x31\x2e\x37\x2c\x32\x35\x36\
-\x2c\x32\x32\x34\x7a\x22\x2f\x3e\x0a\x09\x3c\x2f\x67\x3e\x0a\x3c\
-\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\
-\x00\x00\x02\x97\
-\x3c\
-\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
-\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
-\x2d\x38\x22\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\x72\
-\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\x20\x49\x6c\x6c\x75\
-\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x38\x2e\x31\x2e\x31\x2c\x20\
-\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\x50\x6c\x75\x67\x2d\
-\x49\x6e\x20\x2e\x20\x53\x56\x47\x20\x56\x65\x72\x73\x69\x6f\x6e\
-\x3a\x20\x36\x2e\x30\x30\x20\x42\x75\x69\x6c\x64\x20\x30\x29\x20\
-\x20\x2d\x2d\x3e\x0a\x3c\x21\x44\x4f\x43\x54\x59\x50\x45\x20\x73\
-\x76\x67\x20\x50\x55\x42\x4c\x49\x43\x20\x22\x2d\x2f\x2f\x57\x33\
-\x43\x2f\x2f\x44\x54\x44\x20\x53\x56\x47\x20\x31\x2e\x31\x2f\x2f\
-\x45\x4e\x22\x20\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\
-\x77\x33\x2e\x6f\x72\x67\x2f\x47\x72\x61\x70\x68\x69\x63\x73\x2f\
-\x53\x56\x47\x2f\x31\x2e\x31\x2f\x44\x54\x44\x2f\x73\x76\x67\x31\
-\x31\x2e\x64\x74\x64\x22\x3e\x0a\x3c\x73\x76\x67\x20\x76\x65\x72\
-\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\x3d\x22\x53\
-\x61\x76\x65\x22\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\x74\x74\x70\
-\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x32\x30\
-\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\x6e\x73\x3a\x78\x6c\
-\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\
-\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\x78\x6c\x69\x6e\
-\x6b\x22\x20\x78\x3d\x22\x35\x31\x32\x70\x78\x22\x20\x79\x3d\x22\
-\x35\x31\x32\x70\x78\x22\x0a\x09\x20\x76\x69\x65\x77\x42\x6f\x78\
-\x3d\x22\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x65\
-\x6e\x61\x62\x6c\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\
-\x3d\x22\x6e\x65\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\
-\x32\x22\x20\x78\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\
-\x65\x73\x65\x72\x76\x65\x22\x3e\x0a\x3c\x67\x20\x74\x72\x61\x6e\
-\x73\x66\x6f\x72\x6d\x3d\x27\x6d\x61\x74\x72\x69\x78\x28\x32\x34\
-\x20\x30\x20\x30\x20\x32\x34\x20\x30\x20\x30\x29\x27\x3e\x0a\x3c\
-\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x31\x35\x2e\x31\x37\x33\x2c\
-\x32\x48\x34\x43\x32\x2e\x38\x39\x39\x2c\x32\x2c\x32\x2c\x32\x2e\
-\x39\x2c\x32\x2c\x34\x76\x31\x32\x63\x30\x2c\x31\x2e\x31\x2c\x30\
-\x2e\x38\x39\x39\x2c\x32\x2c\x32\x2c\x32\x68\x31\x32\x63\x31\x2e\
-\x31\x30\x31\x2c\x30\x2c\x32\x2d\x30\x2e\x39\x2c\x32\x2d\x32\x56\
-\x35\x2e\x31\x32\x37\x4c\x31\x35\x2e\x31\x37\x33\x2c\x32\x7a\x20\
-\x4d\x31\x34\x2c\x38\x63\x30\x2c\x30\x2e\x35\x34\x39\x2d\x30\x2e\
-\x34\x35\x2c\x31\x2d\x31\x2c\x31\x48\x37\x0a\x09\x43\x36\x2e\x34\
-\x35\x2c\x39\x2c\x36\x2c\x38\x2e\x35\x34\x39\x2c\x36\x2c\x38\x56\
-\x33\x68\x38\x56\x38\x7a\x20\x4d\x31\x33\x2c\x34\x68\x2d\x32\x76\
-\x34\x68\x32\x56\x34\x7a\x22\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\
-\x2f\x73\x76\x67\x3e\x0a\
+\x27\x3e\x0a\x3c\x63\x69\x72\x63\x6c\x65\x20\x63\x78\x3d\x27\x34\
+\x32\x2e\x37\x34\x34\x35\x27\x20\x63\x79\x3d\x27\x34\x31\x2e\x37\
+\x31\x31\x39\x27\x20\x66\x69\x6c\x6c\x3d\x27\x23\x66\x66\x30\x30\
+\x30\x30\x27\x20\x72\x3d\x27\x36\x2e\x30\x32\x32\x35\x27\x2f\x3e\
+\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\x67\
+\x3e\
\x00\x00\x02\xe7\
\x3c\
\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
@@ -1150,112 +892,31 @@ qt_resource_data = b"\
\x2e\x31\x39\x37\x2c\x31\x37\x2e\x35\x39\x39\x2c\x31\x30\x2c\x31\
\x37\x2e\x35\x39\x39\x7a\x22\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\
\x2f\x73\x76\x67\x3e\x0a\
-\x00\x00\x03\x16\
-\x3c\
-\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
-\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
-\x2d\x38\x22\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\x72\
-\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\x20\x49\x6c\x6c\x75\
-\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x36\x2e\x32\x2e\x31\x2c\x20\
-\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\x50\x6c\x75\x67\x2d\
-\x49\x6e\x20\x2e\x20\x53\x56\x47\x20\x56\x65\x72\x73\x69\x6f\x6e\
-\x3a\x20\x36\x2e\x30\x30\x20\x42\x75\x69\x6c\x64\x20\x30\x29\x20\
-\x20\x2d\x2d\x3e\x0a\x3c\x21\x44\x4f\x43\x54\x59\x50\x45\x20\x73\
-\x76\x67\x20\x50\x55\x42\x4c\x49\x43\x20\x22\x2d\x2f\x2f\x57\x33\
-\x43\x2f\x2f\x44\x54\x44\x20\x53\x56\x47\x20\x31\x2e\x31\x2f\x2f\
-\x45\x4e\x22\x20\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\
-\x77\x33\x2e\x6f\x72\x67\x2f\x47\x72\x61\x70\x68\x69\x63\x73\x2f\
-\x53\x56\x47\x2f\x31\x2e\x31\x2f\x44\x54\x44\x2f\x73\x76\x67\x31\
-\x31\x2e\x64\x74\x64\x22\x3e\x0a\x3c\x73\x76\x67\x20\x76\x65\x72\
-\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\x3d\x22\x4c\
-\x61\x79\x65\x72\x5f\x31\x22\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\
-\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\
-\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\x6e\x73\
-\x3a\x78\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\
-\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\x78\
-\x6c\x69\x6e\x6b\x22\x20\x78\x3d\x22\x30\x70\x78\x22\x20\x79\x3d\
-\x22\x30\x70\x78\x22\x0a\x09\x20\x77\x69\x64\x74\x68\x3d\x22\x35\
-\x31\x32\x70\x78\x22\x20\x68\x65\x69\x67\x68\x74\x3d\x22\x35\x31\
-\x32\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\x20\
-\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x65\x6e\x61\x62\x6c\
-\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3d\x22\x6e\x65\
-\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x78\
-\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\x72\
-\x76\x65\x22\x3e\x0a\x3c\x67\x3e\x0a\x09\x3c\x63\x69\x72\x63\x6c\
-\x65\x20\x63\x78\x3d\x22\x32\x35\x36\x22\x20\x63\x79\x3d\x22\x32\
-\x38\x30\x22\x20\x72\x3d\x22\x36\x33\x22\x2f\x3e\x0a\x09\x3c\x70\
-\x61\x74\x68\x20\x64\x3d\x22\x4d\x34\x34\x30\x2c\x39\x36\x68\x2d\
-\x38\x38\x6c\x2d\x33\x32\x2d\x33\x32\x48\x31\x39\x32\x6c\x2d\x33\
-\x32\x2c\x33\x32\x48\x37\x32\x63\x2d\x32\x32\x2e\x30\x39\x32\x2c\
-\x30\x2d\x34\x30\x2c\x31\x37\x2e\x39\x30\x38\x2d\x34\x30\x2c\x34\
-\x30\x76\x32\x37\x32\x63\x30\x2c\x32\x32\x2e\x30\x39\x32\x2c\x31\
-\x37\x2e\x39\x30\x38\x2c\x34\x30\x2c\x34\x30\x2c\x34\x30\x68\x33\
-\x36\x38\x63\x32\x32\x2e\x30\x39\x32\x2c\x30\x2c\x34\x30\x2d\x31\
-\x37\x2e\x39\x30\x38\x2c\x34\x30\x2d\x34\x30\x0a\x09\x09\x56\x31\
-\x33\x36\x43\x34\x38\x30\x2c\x31\x31\x33\x2e\x39\x30\x38\x2c\x34\
-\x36\x32\x2e\x30\x39\x32\x2c\x39\x36\x2c\x34\x34\x30\x2c\x39\x36\
-\x7a\x20\x4d\x32\x35\x36\x2c\x33\x39\x32\x63\x2d\x36\x31\x2e\x38\
-\x35\x35\x2c\x30\x2d\x31\x31\x32\x2d\x35\x30\x2e\x31\x34\x35\x2d\
-\x31\x31\x32\x2d\x31\x31\x32\x73\x35\x30\x2e\x31\x34\x35\x2d\x31\
-\x31\x32\x2c\x31\x31\x32\x2d\x31\x31\x32\x73\x31\x31\x32\x2c\x35\
-\x30\x2e\x31\x34\x35\x2c\x31\x31\x32\x2c\x31\x31\x32\x0a\x09\x09\
-\x53\x33\x31\x37\x2e\x38\x35\x35\x2c\x33\x39\x32\x2c\x32\x35\x36\
-\x2c\x33\x39\x32\x7a\x22\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\
-\x73\x76\x67\x3e\x0a\
-\x00\x00\x03\x3f\
+\x00\x00\x01\x69\
\x3c\
-\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
-\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
-\x2d\x38\x22\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\x72\
-\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\x20\x49\x6c\x6c\x75\
-\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x36\x2e\x32\x2e\x31\x2c\x20\
-\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\x50\x6c\x75\x67\x2d\
-\x49\x6e\x20\x2e\x20\x53\x56\x47\x20\x56\x65\x72\x73\x69\x6f\x6e\
-\x3a\x20\x36\x2e\x30\x30\x20\x42\x75\x69\x6c\x64\x20\x30\x29\x20\
-\x20\x2d\x2d\x3e\x0a\x3c\x21\x44\x4f\x43\x54\x59\x50\x45\x20\x73\
-\x76\x67\x20\x50\x55\x42\x4c\x49\x43\x20\x22\x2d\x2f\x2f\x57\x33\
-\x43\x2f\x2f\x44\x54\x44\x20\x53\x56\x47\x20\x31\x2e\x31\x2f\x2f\
-\x45\x4e\x22\x20\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\
-\x77\x33\x2e\x6f\x72\x67\x2f\x47\x72\x61\x70\x68\x69\x63\x73\x2f\
-\x53\x56\x47\x2f\x31\x2e\x31\x2f\x44\x54\x44\x2f\x73\x76\x67\x31\
-\x31\x2e\x64\x74\x64\x22\x3e\x0a\x3c\x73\x76\x67\x20\x76\x65\x72\
-\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\x3d\x22\x4c\
-\x61\x79\x65\x72\x5f\x31\x22\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\
-\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\
-\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\x6e\x73\
-\x3a\x78\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\
-\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\x78\
-\x6c\x69\x6e\x6b\x22\x20\x78\x3d\x22\x30\x70\x78\x22\x20\x79\x3d\
-\x22\x30\x70\x78\x22\x0a\x09\x20\x77\x69\x64\x74\x68\x3d\x22\x35\
-\x31\x32\x70\x78\x22\x20\x68\x65\x69\x67\x68\x74\x3d\x22\x35\x31\
-\x32\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\x20\
-\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x65\x6e\x61\x62\x6c\
-\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3d\x22\x6e\x65\
-\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x78\
-\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\x72\
-\x76\x65\x22\x3e\x0a\x3c\x67\x20\x69\x64\x3d\x22\x49\x63\x6f\x6e\
-\x5f\x32\x31\x5f\x22\x3e\x0a\x09\x3c\x67\x3e\x0a\x09\x09\x3c\x70\
-\x61\x74\x68\x20\x64\x3d\x22\x4d\x32\x35\x36\x2c\x31\x35\x32\x63\
-\x2d\x35\x37\x2e\x32\x2c\x30\x2d\x31\x30\x34\x2c\x34\x36\x2e\x38\
-\x2d\x31\x30\x34\x2c\x31\x30\x34\x73\x34\x36\x2e\x38\x2c\x31\x30\
-\x34\x2c\x31\x30\x34\x2c\x31\x30\x34\x73\x31\x30\x34\x2d\x34\x36\
-\x2e\x38\x2c\x31\x30\x34\x2d\x31\x30\x34\x53\x33\x31\x33\x2e\x32\
-\x2c\x31\x35\x32\x2c\x32\x35\x36\x2c\x31\x35\x32\x7a\x20\x4d\x32\
-\x35\x36\x2c\x34\x38\x0a\x09\x09\x09\x43\x31\x34\x31\x2e\x36\x30\
-\x31\x2c\x34\x38\x2c\x34\x38\x2c\x31\x34\x31\x2e\x36\x30\x31\x2c\
-\x34\x38\x2c\x32\x35\x36\x73\x39\x33\x2e\x36\x30\x31\x2c\x32\x30\
-\x38\x2c\x32\x30\x38\x2c\x32\x30\x38\x73\x32\x30\x38\x2d\x39\x33\
-\x2e\x36\x30\x31\x2c\x32\x30\x38\x2d\x32\x30\x38\x53\x33\x37\x30\
-\x2e\x33\x39\x39\x2c\x34\x38\x2c\x32\x35\x36\x2c\x34\x38\x7a\x20\
-\x4d\x32\x35\x36\x2c\x34\x32\x32\x2e\x34\x0a\x09\x09\x09\x63\x2d\
-\x39\x31\x2e\x35\x31\x38\x2c\x30\x2d\x31\x36\x36\x2e\x34\x2d\x37\
-\x34\x2e\x38\x38\x33\x2d\x31\x36\x36\x2e\x34\x2d\x31\x36\x36\x2e\
-\x34\x53\x31\x36\x34\x2e\x34\x38\x32\x2c\x38\x39\x2e\x36\x2c\x32\
-\x35\x36\x2c\x38\x39\x2e\x36\x53\x34\x32\x32\x2e\x34\x2c\x31\x36\
-\x34\x2e\x34\x38\x32\x2c\x34\x32\x32\x2e\x34\x2c\x32\x35\x36\x53\
-\x33\x34\x37\x2e\x35\x31\x38\x2c\x34\x32\x32\x2e\x34\x2c\x32\x35\
-\x36\x2c\x34\x32\x32\x2e\x34\x7a\x22\x2f\x3e\x0a\x09\x3c\x2f\x67\
-\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\
+\x73\x76\x67\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\
+\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x32\x30\x30\
+\x30\x2f\x73\x76\x67\x22\x20\x77\x69\x64\x74\x68\x3d\x22\x35\x31\
+\x32\x70\x78\x22\x20\x68\x65\x69\x67\x68\x74\x3d\x22\x35\x31\x32\
+\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\x20\x30\
+\x20\x35\x31\x32\x20\x35\x31\x32\x22\x3e\x3c\x67\x20\x74\x72\x61\
+\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x6d\x61\x74\x72\x69\x78\x28\x32\
+\x34\x20\x30\x20\x30\x20\x32\x34\x20\x30\x20\x30\x29\x27\x3e\x3c\
+\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x34\x2e\x33\x34\x20\x31\x35\
+\x2e\x36\x36\x41\x37\x2e\x39\x37\x20\x37\x2e\x39\x37\x20\x30\x20\
+\x30\x20\x30\x20\x39\x20\x31\x37\x2e\x39\x34\x56\x31\x30\x48\x35\
+\x56\x38\x68\x34\x56\x35\x2e\x38\x33\x61\x33\x20\x33\x20\x30\x20\
+\x31\x20\x31\x20\x32\x20\x30\x56\x38\x68\x34\x76\x32\x68\x2d\x34\
+\x76\x37\x2e\x39\x34\x61\x37\x2e\x39\x37\x20\x37\x2e\x39\x37\x20\
+\x30\x20\x30\x20\x30\x20\x34\x2e\x36\x36\x2d\x32\x2e\x32\x38\x6c\
+\x2d\x31\x2e\x34\x32\x2d\x31\x2e\x34\x32\x68\x35\x2e\x36\x36\x6c\
+\x2d\x32\x2e\x38\x33\x20\x32\x2e\x38\x33\x61\x31\x30\x20\x31\x30\
+\x20\x30\x20\x30\x20\x31\x2d\x31\x34\x2e\x31\x34\x20\x30\x4c\x2e\
+\x31\x20\x31\x34\x2e\x32\x34\x68\x35\x2e\x36\x36\x6c\x2d\x31\x2e\
+\x34\x32\x20\x31\x2e\x34\x32\x7a\x4d\x31\x30\x20\x34\x61\x31\x20\
+\x31\x20\x30\x20\x31\x20\x30\x20\x30\x2d\x32\x20\x31\x20\x31\x20\
+\x30\x20\x30\x20\x30\x20\x30\x20\x32\x7a\x22\x2f\x3e\x3c\x2f\x67\
+\x3e\x3c\x2f\x73\x76\x67\x3e\x0a\
\x00\x00\x04\x42\
\x3c\
\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
@@ -1327,6 +988,132 @@ qt_resource_data = b"\
\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\x3e\x0a\x3c\x2f\x67\x3e\
\x0a\x3c\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\
\x0a\
+\x00\x00\x02\x72\
+\x3c\
+\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
+\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
+\x2d\x38\x22\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\x72\
+\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\x20\x49\x6c\x6c\x75\
+\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x36\x2e\x32\x2e\x31\x2c\x20\
+\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\x50\x6c\x75\x67\x2d\
+\x49\x6e\x20\x2e\x20\x53\x56\x47\x20\x56\x65\x72\x73\x69\x6f\x6e\
+\x3a\x20\x36\x2e\x30\x30\x20\x42\x75\x69\x6c\x64\x20\x30\x29\x20\
+\x20\x2d\x2d\x3e\x0a\x3c\x21\x44\x4f\x43\x54\x59\x50\x45\x20\x73\
+\x76\x67\x20\x50\x55\x42\x4c\x49\x43\x20\x22\x2d\x2f\x2f\x57\x33\
+\x43\x2f\x2f\x44\x54\x44\x20\x53\x56\x47\x20\x31\x2e\x31\x2f\x2f\
+\x45\x4e\x22\x20\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\
+\x77\x33\x2e\x6f\x72\x67\x2f\x47\x72\x61\x70\x68\x69\x63\x73\x2f\
+\x53\x56\x47\x2f\x31\x2e\x31\x2f\x44\x54\x44\x2f\x73\x76\x67\x31\
+\x31\x2e\x64\x74\x64\x22\x3e\x0a\x3c\x73\x76\x67\x20\x76\x65\x72\
+\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\x3d\x22\x4c\
+\x61\x79\x65\x72\x5f\x31\x22\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\
+\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\
+\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\x6e\x73\
+\x3a\x78\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\
+\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\x78\
+\x6c\x69\x6e\x6b\x22\x20\x78\x3d\x22\x30\x70\x78\x22\x20\x79\x3d\
+\x22\x30\x70\x78\x22\x0a\x09\x20\x77\x69\x64\x74\x68\x3d\x22\x35\
+\x31\x32\x70\x78\x22\x20\x68\x65\x69\x67\x68\x74\x3d\x22\x35\x31\
+\x32\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\x20\
+\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x65\x6e\x61\x62\x6c\
+\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3d\x22\x6e\x65\
+\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x78\
+\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\x72\
+\x76\x65\x22\x3e\x0a\x3c\x67\x20\x69\x64\x3d\x22\x49\x63\x6f\x6e\
+\x5f\x38\x5f\x22\x3e\x0a\x09\x3c\x67\x3e\x0a\x09\x09\x3c\x70\x61\
+\x74\x68\x20\x64\x3d\x22\x4d\x38\x35\x2c\x32\x37\x37\x2e\x33\x37\
+\x35\x68\x32\x35\x39\x2e\x37\x30\x34\x4c\x32\x32\x35\x2e\x30\x30\
+\x32\x2c\x33\x39\x37\x2e\x30\x37\x37\x4c\x32\x35\x36\x2c\x34\x32\
+\x37\x6c\x31\x37\x31\x2d\x31\x37\x31\x4c\x32\x35\x36\x2c\x38\x35\
+\x6c\x2d\x32\x39\x2e\x39\x32\x32\x2c\x32\x39\x2e\x39\x32\x34\x6c\
+\x31\x31\x38\x2e\x36\x32\x36\x2c\x31\x31\x39\x2e\x37\x30\x31\x48\
+\x38\x35\x56\x32\x37\x37\x2e\x33\x37\x35\x7a\x22\x2f\x3e\x0a\x09\
+\x3c\x2f\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\
+\x0a\
+\x00\x00\x05\x16\
+\x3c\
+\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
+\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
+\x2d\x38\x22\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\x72\
+\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\x20\x49\x6c\x6c\x75\
+\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x36\x2e\x32\x2e\x31\x2c\x20\
+\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\x50\x6c\x75\x67\x2d\
+\x49\x6e\x20\x2e\x20\x53\x56\x47\x20\x56\x65\x72\x73\x69\x6f\x6e\
+\x3a\x20\x36\x2e\x30\x30\x20\x42\x75\x69\x6c\x64\x20\x30\x29\x20\
+\x20\x2d\x2d\x3e\x0a\x3c\x21\x44\x4f\x43\x54\x59\x50\x45\x20\x73\
+\x76\x67\x20\x50\x55\x42\x4c\x49\x43\x20\x22\x2d\x2f\x2f\x57\x33\
+\x43\x2f\x2f\x44\x54\x44\x20\x53\x56\x47\x20\x31\x2e\x31\x2f\x2f\
+\x45\x4e\x22\x20\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\
+\x77\x33\x2e\x6f\x72\x67\x2f\x47\x72\x61\x70\x68\x69\x63\x73\x2f\
+\x53\x56\x47\x2f\x31\x2e\x31\x2f\x44\x54\x44\x2f\x73\x76\x67\x31\
+\x31\x2e\x64\x74\x64\x22\x3e\x0a\x3c\x73\x76\x67\x20\x76\x65\x72\
+\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\x3d\x22\x4c\
+\x61\x79\x65\x72\x5f\x31\x22\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\
+\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\
+\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\x6e\x73\
+\x3a\x78\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\
+\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\x78\
+\x6c\x69\x6e\x6b\x22\x20\x78\x3d\x22\x30\x70\x78\x22\x20\x79\x3d\
+\x22\x30\x70\x78\x22\x0a\x09\x20\x77\x69\x64\x74\x68\x3d\x22\x35\
+\x31\x32\x70\x78\x22\x20\x68\x65\x69\x67\x68\x74\x3d\x22\x35\x31\
+\x32\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\x20\
+\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x65\x6e\x61\x62\x6c\
+\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3d\x22\x6e\x65\
+\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x78\
+\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\x72\
+\x76\x65\x22\x3e\x0a\x3c\x67\x20\x69\x64\x3d\x22\x49\x63\x6f\x6e\
+\x5f\x31\x32\x5f\x22\x3e\x0a\x09\x3c\x67\x3e\x0a\x09\x09\x3c\x70\
+\x61\x74\x68\x20\x64\x3d\x22\x4d\x32\x35\x36\x2c\x36\x34\x43\x31\
+\x35\x30\x2e\x34\x30\x31\x2c\x36\x34\x2c\x36\x34\x2c\x31\x35\x30\
+\x2e\x34\x30\x31\x2c\x36\x34\x2c\x32\x35\x36\x63\x30\x2c\x31\x30\
+\x35\x2e\x36\x30\x34\x2c\x38\x36\x2e\x34\x30\x31\x2c\x31\x39\x32\
+\x2c\x31\x39\x32\x2c\x31\x39\x32\x63\x31\x38\x2e\x31\x33\x36\x2c\
+\x30\x2c\x33\x32\x2d\x31\x33\x2e\x38\x36\x34\x2c\x33\x32\x2d\x33\
+\x32\x0a\x09\x09\x09\x63\x30\x2d\x38\x2e\x35\x33\x31\x2d\x33\x2e\
+\x31\x39\x38\x2d\x31\x36\x2d\x38\x2e\x35\x33\x31\x2d\x32\x31\x2e\
+\x33\x33\x33\x63\x2d\x35\x2e\x33\x33\x33\x2d\x35\x2e\x33\x33\x34\
+\x2d\x38\x2e\x35\x33\x31\x2d\x31\x32\x2e\x38\x30\x33\x2d\x38\x2e\
+\x35\x33\x31\x2d\x32\x31\x2e\x33\x33\x34\x63\x30\x2d\x31\x38\x2e\
+\x31\x33\x35\x2c\x31\x33\x2e\x38\x36\x34\x2d\x33\x32\x2c\x33\x32\
+\x2d\x33\x32\x68\x33\x38\x2e\x33\x39\x36\x0a\x09\x09\x09\x63\x35\
+\x38\x2e\x36\x36\x37\x2c\x30\x2c\x31\x30\x36\x2e\x36\x36\x37\x2d\
+\x34\x38\x2c\x31\x30\x36\x2e\x36\x36\x37\x2d\x31\x30\x36\x2e\x36\
+\x36\x36\x43\x34\x34\x38\x2c\x31\x34\x30\x2e\x38\x30\x32\x2c\x33\
+\x36\x31\x2e\x36\x30\x34\x2c\x36\x34\x2c\x32\x35\x36\x2c\x36\x34\
+\x7a\x20\x4d\x31\x33\x38\x2e\x36\x36\x37\x2c\x32\x35\x36\x63\x2d\
+\x31\x38\x2e\x31\x33\x36\x2c\x30\x2d\x33\x32\x2d\x31\x33\x2e\x38\
+\x36\x34\x2d\x33\x32\x2d\x33\x32\x73\x31\x33\x2e\x38\x36\x34\x2d\
+\x33\x32\x2c\x33\x32\x2d\x33\x32\x0a\x09\x09\x09\x63\x31\x38\x2e\
+\x31\x33\x35\x2c\x30\x2c\x33\x32\x2c\x31\x33\x2e\x38\x36\x34\x2c\
+\x33\x32\x2c\x33\x32\x53\x31\x35\x36\x2e\x38\x30\x32\x2c\x32\x35\
+\x36\x2c\x31\x33\x38\x2e\x36\x36\x37\x2c\x32\x35\x36\x7a\x20\x4d\
+\x32\x30\x32\x2e\x36\x36\x37\x2c\x31\x37\x30\x2e\x36\x36\x37\x63\
+\x2d\x31\x38\x2e\x31\x33\x36\x2c\x30\x2d\x33\x32\x2d\x31\x33\x2e\
+\x38\x36\x35\x2d\x33\x32\x2d\x33\x32\x63\x30\x2d\x31\x38\x2e\x31\
+\x33\x36\x2c\x31\x33\x2e\x38\x36\x34\x2d\x33\x32\x2c\x33\x32\x2d\
+\x33\x32\x0a\x09\x09\x09\x63\x31\x38\x2e\x31\x33\x35\x2c\x30\x2c\
+\x33\x32\x2c\x31\x33\x2e\x38\x36\x34\x2c\x33\x32\x2c\x33\x32\x43\
+\x32\x33\x34\x2e\x36\x36\x37\x2c\x31\x35\x36\x2e\x38\x30\x32\x2c\
+\x32\x32\x30\x2e\x38\x30\x32\x2c\x31\x37\x30\x2e\x36\x36\x37\x2c\
+\x32\x30\x32\x2e\x36\x36\x37\x2c\x31\x37\x30\x2e\x36\x36\x37\x7a\
+\x20\x4d\x33\x30\x39\x2e\x33\x33\x33\x2c\x31\x37\x30\x2e\x36\x36\
+\x37\x63\x2d\x31\x38\x2e\x31\x33\x35\x2c\x30\x2d\x33\x32\x2d\x31\
+\x33\x2e\x38\x36\x35\x2d\x33\x32\x2d\x33\x32\x0a\x09\x09\x09\x63\
+\x30\x2d\x31\x38\x2e\x31\x33\x36\x2c\x31\x33\x2e\x38\x36\x35\x2d\
+\x33\x32\x2c\x33\x32\x2d\x33\x32\x63\x31\x38\x2e\x31\x33\x36\x2c\
+\x30\x2c\x33\x32\x2c\x31\x33\x2e\x38\x36\x34\x2c\x33\x32\x2c\x33\
+\x32\x43\x33\x34\x31\x2e\x33\x33\x33\x2c\x31\x35\x36\x2e\x38\x30\
+\x32\x2c\x33\x32\x37\x2e\x34\x36\x39\x2c\x31\x37\x30\x2e\x36\x36\
+\x37\x2c\x33\x30\x39\x2e\x33\x33\x33\x2c\x31\x37\x30\x2e\x36\x36\
+\x37\x7a\x20\x4d\x33\x37\x33\x2e\x33\x33\x33\x2c\x32\x35\x36\x0a\
+\x09\x09\x09\x63\x2d\x31\x38\x2e\x31\x33\x35\x2c\x30\x2d\x33\x32\
+\x2d\x31\x33\x2e\x38\x36\x34\x2d\x33\x32\x2d\x33\x32\x73\x31\x33\
+\x2e\x38\x36\x35\x2d\x33\x32\x2c\x33\x32\x2d\x33\x32\x63\x31\x38\
+\x2e\x31\x33\x36\x2c\x30\x2c\x33\x32\x2c\x31\x33\x2e\x38\x36\x34\
+\x2c\x33\x32\x2c\x33\x32\x53\x33\x39\x31\x2e\x34\x36\x39\x2c\x32\
+\x35\x36\x2c\x33\x37\x33\x2e\x33\x33\x33\x2c\x32\x35\x36\x7a\x22\
+\x2f\x3e\x0a\x09\x3c\x2f\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\
+\x73\x76\x67\x3e\x0a\
\x00\x00\x07\x6b\
\x3c\
\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
@@ -1448,7 +1235,27 @@ qt_resource_data = b"\
\x32\x37\x34\x2c\x33\x38\x32\x2e\x38\x32\x2c\x33\x30\x37\x2e\x38\
\x36\x37\x2c\x33\x38\x32\x2e\x38\x32\x7a\x22\x2f\x3e\x0a\x3c\x2f\
\x67\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\
-\x00\x00\x05\x16\
+\x00\x00\x01\x1c\
+\x3c\
+\x73\x76\x67\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\
+\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x32\x30\x30\
+\x30\x2f\x73\x76\x67\x22\x20\x77\x69\x64\x74\x68\x3d\x22\x35\x31\
+\x32\x70\x78\x22\x20\x68\x65\x69\x67\x68\x74\x3d\x22\x35\x31\x32\
+\x70\x78\x22\x0a\x20\x20\x20\x20\x20\x76\x69\x65\x77\x42\x6f\x78\
+\x3d\x22\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x3e\x0a\
+\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x6d\x61\
+\x74\x72\x69\x78\x28\x34\x38\x20\x30\x20\x30\x20\x34\x38\x20\x34\
+\x38\x20\x34\x38\x29\x27\x3e\x0a\x20\x20\x3c\x70\x61\x74\x68\x20\
+\x64\x3d\x22\x4d\x30\x20\x30\x76\x32\x68\x2e\x35\x63\x30\x2d\x2e\
+\x35\x35\x2e\x34\x35\x2d\x31\x20\x31\x2d\x31\x68\x31\x2e\x35\x76\
+\x35\x2e\x35\x63\x30\x20\x2e\x32\x38\x2d\x2e\x32\x32\x2e\x35\x2d\
+\x2e\x35\x2e\x35\x68\x2d\x2e\x35\x76\x31\x68\x34\x76\x2d\x31\x68\
+\x2d\x2e\x35\x63\x2d\x2e\x32\x38\x20\x30\x2d\x2e\x35\x2d\x2e\x32\
+\x32\x2d\x2e\x35\x2d\x2e\x35\x76\x2d\x35\x2e\x35\x68\x31\x2e\x35\
+\x63\x2e\x35\x35\x20\x30\x20\x31\x20\x2e\x34\x35\x20\x31\x20\x31\
+\x68\x2e\x35\x76\x2d\x32\x68\x2d\x38\x7a\x22\x20\x2f\x3e\x0a\x3c\
+\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\
+\x00\x00\x02\xc1\
\x3c\
\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
@@ -1475,64 +1282,27 @@ qt_resource_data = b"\
\x22\x30\x70\x78\x22\x0a\x09\x20\x77\x69\x64\x74\x68\x3d\x22\x35\
\x31\x32\x70\x78\x22\x20\x68\x65\x69\x67\x68\x74\x3d\x22\x35\x31\
\x32\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\x20\
-\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x65\x6e\x61\x62\x6c\
-\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3d\x22\x6e\x65\
-\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x78\
-\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\x72\
-\x76\x65\x22\x3e\x0a\x3c\x67\x20\x69\x64\x3d\x22\x49\x63\x6f\x6e\
-\x5f\x31\x32\x5f\x22\x3e\x0a\x09\x3c\x67\x3e\x0a\x09\x09\x3c\x70\
-\x61\x74\x68\x20\x64\x3d\x22\x4d\x32\x35\x36\x2c\x36\x34\x43\x31\
-\x35\x30\x2e\x34\x30\x31\x2c\x36\x34\x2c\x36\x34\x2c\x31\x35\x30\
-\x2e\x34\x30\x31\x2c\x36\x34\x2c\x32\x35\x36\x63\x30\x2c\x31\x30\
-\x35\x2e\x36\x30\x34\x2c\x38\x36\x2e\x34\x30\x31\x2c\x31\x39\x32\
-\x2c\x31\x39\x32\x2c\x31\x39\x32\x63\x31\x38\x2e\x31\x33\x36\x2c\
-\x30\x2c\x33\x32\x2d\x31\x33\x2e\x38\x36\x34\x2c\x33\x32\x2d\x33\
-\x32\x0a\x09\x09\x09\x63\x30\x2d\x38\x2e\x35\x33\x31\x2d\x33\x2e\
-\x31\x39\x38\x2d\x31\x36\x2d\x38\x2e\x35\x33\x31\x2d\x32\x31\x2e\
-\x33\x33\x33\x63\x2d\x35\x2e\x33\x33\x33\x2d\x35\x2e\x33\x33\x34\
-\x2d\x38\x2e\x35\x33\x31\x2d\x31\x32\x2e\x38\x30\x33\x2d\x38\x2e\
-\x35\x33\x31\x2d\x32\x31\x2e\x33\x33\x34\x63\x30\x2d\x31\x38\x2e\
-\x31\x33\x35\x2c\x31\x33\x2e\x38\x36\x34\x2d\x33\x32\x2c\x33\x32\
-\x2d\x33\x32\x68\x33\x38\x2e\x33\x39\x36\x0a\x09\x09\x09\x63\x35\
-\x38\x2e\x36\x36\x37\x2c\x30\x2c\x31\x30\x36\x2e\x36\x36\x37\x2d\
-\x34\x38\x2c\x31\x30\x36\x2e\x36\x36\x37\x2d\x31\x30\x36\x2e\x36\
-\x36\x36\x43\x34\x34\x38\x2c\x31\x34\x30\x2e\x38\x30\x32\x2c\x33\
-\x36\x31\x2e\x36\x30\x34\x2c\x36\x34\x2c\x32\x35\x36\x2c\x36\x34\
-\x7a\x20\x4d\x31\x33\x38\x2e\x36\x36\x37\x2c\x32\x35\x36\x63\x2d\
-\x31\x38\x2e\x31\x33\x36\x2c\x30\x2d\x33\x32\x2d\x31\x33\x2e\x38\
-\x36\x34\x2d\x33\x32\x2d\x33\x32\x73\x31\x33\x2e\x38\x36\x34\x2d\
-\x33\x32\x2c\x33\x32\x2d\x33\x32\x0a\x09\x09\x09\x63\x31\x38\x2e\
-\x31\x33\x35\x2c\x30\x2c\x33\x32\x2c\x31\x33\x2e\x38\x36\x34\x2c\
-\x33\x32\x2c\x33\x32\x53\x31\x35\x36\x2e\x38\x30\x32\x2c\x32\x35\
-\x36\x2c\x31\x33\x38\x2e\x36\x36\x37\x2c\x32\x35\x36\x7a\x20\x4d\
-\x32\x30\x32\x2e\x36\x36\x37\x2c\x31\x37\x30\x2e\x36\x36\x37\x63\
-\x2d\x31\x38\x2e\x31\x33\x36\x2c\x30\x2d\x33\x32\x2d\x31\x33\x2e\
-\x38\x36\x35\x2d\x33\x32\x2d\x33\x32\x63\x30\x2d\x31\x38\x2e\x31\
-\x33\x36\x2c\x31\x33\x2e\x38\x36\x34\x2d\x33\x32\x2c\x33\x32\x2d\
-\x33\x32\x0a\x09\x09\x09\x63\x31\x38\x2e\x31\x33\x35\x2c\x30\x2c\
-\x33\x32\x2c\x31\x33\x2e\x38\x36\x34\x2c\x33\x32\x2c\x33\x32\x43\
-\x32\x33\x34\x2e\x36\x36\x37\x2c\x31\x35\x36\x2e\x38\x30\x32\x2c\
-\x32\x32\x30\x2e\x38\x30\x32\x2c\x31\x37\x30\x2e\x36\x36\x37\x2c\
-\x32\x30\x32\x2e\x36\x36\x37\x2c\x31\x37\x30\x2e\x36\x36\x37\x7a\
-\x20\x4d\x33\x30\x39\x2e\x33\x33\x33\x2c\x31\x37\x30\x2e\x36\x36\
-\x37\x63\x2d\x31\x38\x2e\x31\x33\x35\x2c\x30\x2d\x33\x32\x2d\x31\
-\x33\x2e\x38\x36\x35\x2d\x33\x32\x2d\x33\x32\x0a\x09\x09\x09\x63\
-\x30\x2d\x31\x38\x2e\x31\x33\x36\x2c\x31\x33\x2e\x38\x36\x35\x2d\
-\x33\x32\x2c\x33\x32\x2d\x33\x32\x63\x31\x38\x2e\x31\x33\x36\x2c\
-\x30\x2c\x33\x32\x2c\x31\x33\x2e\x38\x36\x34\x2c\x33\x32\x2c\x33\
-\x32\x43\x33\x34\x31\x2e\x33\x33\x33\x2c\x31\x35\x36\x2e\x38\x30\
-\x32\x2c\x33\x32\x37\x2e\x34\x36\x39\x2c\x31\x37\x30\x2e\x36\x36\
-\x37\x2c\x33\x30\x39\x2e\x33\x33\x33\x2c\x31\x37\x30\x2e\x36\x36\
-\x37\x7a\x20\x4d\x33\x37\x33\x2e\x33\x33\x33\x2c\x32\x35\x36\x0a\
-\x09\x09\x09\x63\x2d\x31\x38\x2e\x31\x33\x35\x2c\x30\x2d\x33\x32\
-\x2d\x31\x33\x2e\x38\x36\x34\x2d\x33\x32\x2d\x33\x32\x73\x31\x33\
-\x2e\x38\x36\x35\x2d\x33\x32\x2c\x33\x32\x2d\x33\x32\x63\x31\x38\
-\x2e\x31\x33\x36\x2c\x30\x2c\x33\x32\x2c\x31\x33\x2e\x38\x36\x34\
-\x2c\x33\x32\x2c\x33\x32\x53\x33\x39\x31\x2e\x34\x36\x39\x2c\x32\
-\x35\x36\x2c\x33\x37\x33\x2e\x33\x33\x33\x2c\x32\x35\x36\x7a\x22\
-\x2f\x3e\x0a\x09\x3c\x2f\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\
-\x73\x76\x67\x3e\x0a\
-\x00\x00\x05\xbb\
+\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x73\x74\x79\x6c\x65\
+\x3d\x22\x65\x6e\x61\x62\x6c\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\
+\x75\x6e\x64\x3a\x6e\x65\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\
+\x35\x31\x32\x3b\x22\x20\x78\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\
+\x22\x70\x72\x65\x73\x65\x72\x76\x65\x22\x3e\x0a\x3c\x70\x6f\x6c\
+\x79\x67\x6f\x6e\x20\x70\x6f\x69\x6e\x74\x73\x3d\x22\x34\x38\x30\
+\x2c\x32\x35\x36\x20\x33\x38\x34\x2c\x31\x36\x30\x20\x33\x38\x34\
+\x2c\x32\x33\x36\x20\x32\x37\x36\x2c\x32\x33\x36\x20\x32\x37\x36\
+\x2c\x31\x32\x38\x20\x33\x35\x32\x2c\x31\x32\x38\x20\x32\x35\x36\
+\x2c\x33\x32\x20\x31\x36\x30\x2c\x31\x32\x38\x20\x32\x33\x36\x2c\
+\x31\x32\x38\x20\x32\x33\x36\x2c\x32\x33\x36\x20\x31\x32\x38\x2c\
+\x32\x33\x36\x20\x31\x32\x38\x2c\x31\x36\x30\x20\x33\x32\x2c\x32\
+\x35\x36\x20\x31\x32\x38\x2c\x33\x35\x32\x20\x0a\x09\x31\x32\x38\
+\x2c\x32\x37\x36\x20\x32\x33\x36\x2c\x32\x37\x36\x20\x32\x33\x36\
+\x2c\x33\x38\x34\x20\x31\x36\x30\x2c\x33\x38\x34\x20\x32\x35\x36\
+\x2c\x34\x38\x30\x20\x33\x35\x32\x2c\x33\x38\x34\x20\x32\x37\x35\
+\x2e\x38\x2c\x33\x38\x34\x20\x32\x37\x35\x2e\x34\x2c\x32\x37\x35\
+\x2e\x35\x20\x33\x38\x34\x2c\x32\x37\x35\x2e\x38\x20\x33\x38\x34\
+\x2c\x33\x35\x32\x20\x22\x2f\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\
+\
+\x00\x00\x02\x98\
\x3c\
\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
@@ -1563,76 +1333,26 @@ qt_resource_data = b"\
\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3d\x22\x6e\x65\
\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x78\
\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\x72\
-\x76\x65\x22\x3e\x0a\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x34\
-\x35\x30\x2e\x36\x37\x39\x2c\x32\x37\x33\x2e\x35\x63\x2d\x31\x34\
-\x2e\x35\x38\x35\x2d\x31\x34\x2e\x35\x37\x37\x2d\x33\x36\x2e\x30\
-\x35\x34\x2d\x31\x35\x2e\x38\x39\x2d\x35\x30\x2e\x36\x33\x39\x2d\
-\x31\x2e\x33\x31\x32\x6c\x2d\x34\x31\x2e\x36\x38\x37\x2c\x34\x31\
-\x2e\x36\x36\x34\x63\x2d\x31\x30\x2e\x38\x35\x32\x2c\x31\x30\x2e\
-\x38\x33\x36\x2d\x32\x33\x2e\x39\x33\x2c\x31\x30\x2e\x38\x35\x39\
-\x2d\x33\x31\x2e\x35\x36\x34\x2c\x31\x2e\x38\x35\x32\x0a\x09\x63\
-\x2d\x35\x2e\x30\x35\x37\x2d\x35\x2e\x39\x36\x38\x2d\x33\x2e\x30\
-\x36\x31\x2d\x32\x34\x2e\x33\x37\x34\x2d\x31\x2e\x36\x34\x34\x2d\
-\x33\x36\x2e\x30\x34\x39\x6c\x32\x30\x2e\x39\x30\x37\x2d\x31\x37\
-\x31\x2e\x38\x34\x39\x63\x31\x2e\x38\x36\x37\x2d\x31\x35\x2e\x33\
-\x35\x33\x2d\x39\x2e\x30\x37\x2d\x33\x30\x2e\x31\x38\x35\x2d\x32\
-\x34\x2e\x34\x33\x2d\x33\x32\x2e\x30\x35\x31\x0a\x09\x63\x2d\x31\
-\x35\x2e\x33\x35\x38\x2d\x31\x2e\x38\x36\x37\x2d\x32\x39\x2e\x33\
-\x32\x32\x2c\x39\x2e\x39\x33\x39\x2d\x33\x31\x2e\x31\x39\x31\x2c\
-\x32\x35\x2e\x32\x38\x39\x4c\x32\x36\x37\x2e\x33\x37\x2c\x32\x33\
-\x36\x2e\x30\x32\x31\x63\x2d\x31\x2e\x32\x30\x35\x2c\x33\x2e\x33\
-\x35\x38\x2d\x33\x2e\x37\x39\x2c\x33\x2e\x39\x33\x38\x2d\x34\x2e\
-\x30\x38\x31\x2d\x30\x2e\x35\x38\x32\x4c\x32\x35\x35\x2e\x34\x34\
-\x2c\x36\x30\x0a\x09\x63\x30\x2d\x31\x35\x2e\x34\x36\x35\x2d\x31\
-\x32\x2e\x35\x34\x32\x2d\x32\x38\x2d\x32\x38\x2e\x30\x31\x34\x2d\
-\x32\x38\x63\x2d\x31\x35\x2e\x34\x37\x33\x2c\x30\x2d\x32\x38\x2e\
-\x30\x31\x35\x2c\x31\x32\x2e\x35\x33\x35\x2d\x32\x38\x2e\x30\x31\
-\x35\x2c\x32\x38\x6c\x2d\x30\x2e\x35\x35\x32\x2c\x31\x37\x36\x2e\
-\x37\x35\x32\x63\x30\x2e\x31\x34\x36\x2c\x32\x2e\x30\x34\x2d\x31\
-\x2e\x36\x30\x34\x2c\x32\x2e\x36\x32\x34\x2d\x31\x2e\x39\x32\x2c\
-\x30\x2e\x32\x39\x34\x4c\x31\x37\x32\x2e\x30\x31\x36\x2c\x39\x39\
-\x2e\x30\x37\x37\x0a\x09\x63\x2d\x32\x2e\x37\x35\x2d\x31\x35\x2e\
-\x32\x31\x39\x2d\x31\x37\x2e\x33\x32\x33\x2d\x32\x36\x2e\x32\x30\
-\x33\x2d\x33\x32\x2e\x35\x34\x38\x2d\x32\x33\x2e\x34\x35\x33\x63\
-\x2d\x31\x35\x2e\x32\x32\x37\x2c\x32\x2e\x37\x34\x38\x2d\x32\x35\
-\x2e\x33\x33\x39\x2c\x31\x38\x2e\x31\x38\x37\x2d\x32\x32\x2e\x35\
-\x39\x31\x2c\x33\x33\x2e\x34\x30\x33\x6c\x32\x32\x2e\x31\x39\x33\
-\x2c\x31\x36\x31\x2e\x34\x35\x35\x0a\x09\x63\x30\x2e\x30\x32\x33\
-\x2c\x32\x2e\x38\x37\x32\x2d\x30\x2e\x39\x34\x31\x2c\x34\x2e\x35\
-\x31\x33\x2d\x32\x2e\x33\x30\x38\x2c\x30\x2e\x38\x33\x31\x6c\x2d\
-\x33\x33\x2e\x31\x30\x39\x2d\x38\x38\x2e\x35\x31\x37\x63\x2d\x35\
-\x2e\x31\x38\x2d\x31\x34\x2e\x35\x37\x32\x2d\x32\x31\x2e\x31\x39\
-\x36\x2d\x32\x33\x2e\x30\x36\x35\x2d\x33\x35\x2e\x37\x37\x36\x2d\
-\x31\x37\x2e\x38\x38\x39\x0a\x09\x63\x2d\x31\x34\x2e\x35\x37\x39\
-\x2c\x35\x2e\x31\x37\x37\x2d\x32\x32\x2e\x32\x30\x31\x2c\x32\x32\
-\x2e\x30\x36\x31\x2d\x31\x37\x2e\x30\x32\x33\x2c\x33\x36\x2e\x36\
-\x33\x31\x6c\x35\x38\x2e\x30\x34\x32\x2c\x31\x38\x39\x2e\x36\x32\
-\x35\x63\x30\x2e\x33\x30\x33\x2c\x31\x2e\x30\x34\x36\x2c\x30\x2e\
-\x36\x32\x34\x2c\x32\x2e\x30\x38\x35\x2c\x30\x2e\x39\x35\x33\x2c\
-\x33\x2e\x31\x31\x38\x6c\x30\x2e\x31\x32\x31\x2c\x30\x2e\x33\x39\
-\x0a\x09\x63\x30\x2e\x30\x31\x31\x2c\x30\x2e\x30\x33\x31\x2c\x30\
-\x2e\x30\x32\x35\x2c\x30\x2e\x30\x35\x38\x2c\x30\x2e\x30\x33\x35\
-\x2c\x30\x2e\x30\x38\x38\x43\x31\x32\x36\x2e\x30\x37\x39\x2c\x34\
-\x34\x34\x2e\x32\x33\x33\x2c\x31\x37\x32\x2e\x35\x37\x2c\x34\x38\
-\x30\x2c\x32\x32\x37\x2e\x34\x32\x37\x2c\x34\x38\x30\x63\x33\x35\
-\x2e\x31\x31\x36\x2c\x30\x2c\x37\x31\x2e\x35\x39\x31\x2d\x31\x32\
-\x2e\x33\x37\x38\x2c\x39\x39\x2e\x33\x35\x37\x2d\x33\x33\x2e\x36\
-\x37\x32\x0a\x09\x63\x30\x2e\x30\x30\x31\x2c\x30\x2c\x30\x2e\x30\
-\x30\x33\x2d\x30\x2e\x30\x30\x32\x2c\x30\x2e\x30\x30\x33\x2d\x30\
-\x2e\x30\x30\x32\x63\x32\x39\x2e\x39\x39\x2d\x31\x38\x2e\x30\x35\
-\x31\x2c\x31\x32\x36\x2e\x30\x37\x31\x2d\x31\x32\x31\x2e\x33\x34\
-\x37\x2c\x31\x32\x36\x2e\x30\x37\x31\x2d\x31\x32\x31\x2e\x33\x34\
-\x37\x43\x34\x36\x37\x2e\x34\x34\x35\x2c\x33\x31\x30\x2e\x34\x30\
-\x32\x2c\x34\x36\x35\x2e\x32\x36\x36\x2c\x32\x38\x38\x2e\x30\x38\
-\x2c\x34\x35\x30\x2e\x36\x37\x39\x2c\x32\x37\x33\x2e\x35\x7a\x22\
-\x2f\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\
-\x00\x00\x02\xab\
+\x76\x65\x22\x3e\x0a\x3c\x67\x3e\x0a\x09\x3c\x70\x61\x74\x68\x20\
+\x64\x3d\x22\x4d\x31\x32\x38\x2c\x34\x30\x35\x2e\x34\x32\x39\x43\
+\x31\x32\x38\x2c\x34\x32\x38\x2e\x38\x34\x36\x2c\x31\x34\x37\x2e\
+\x31\x39\x38\x2c\x34\x34\x38\x2c\x31\x37\x30\x2e\x36\x36\x37\x2c\
+\x34\x34\x38\x68\x31\x37\x30\x2e\x36\x36\x37\x43\x33\x36\x34\x2e\
+\x38\x30\x32\x2c\x34\x34\x38\x2c\x33\x38\x34\x2c\x34\x32\x38\x2e\
+\x38\x34\x36\x2c\x33\x38\x34\x2c\x34\x30\x35\x2e\x34\x32\x39\x56\
+\x31\x36\x30\x48\x31\x32\x38\x56\x34\x30\x35\x2e\x34\x32\x39\x7a\
+\x20\x4d\x34\x31\x36\x2c\x39\x36\x0a\x09\x09\x68\x2d\x38\x30\x6c\
+\x2d\x32\x36\x2e\x37\x38\x35\x2d\x33\x32\x48\x32\x30\x32\x2e\x37\
+\x38\x36\x4c\x31\x37\x36\x2c\x39\x36\x48\x39\x36\x76\x33\x32\x68\
+\x33\x32\x30\x56\x39\x36\x7a\x22\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\
+\x3c\x2f\x73\x76\x67\x3e\x0a\
+\x00\x00\x02\x97\
\x3c\
\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
\x2d\x38\x22\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\x72\
\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\x20\x49\x6c\x6c\x75\
-\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x36\x2e\x32\x2e\x31\x2c\x20\
+\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x38\x2e\x31\x2e\x31\x2c\x20\
\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\x50\x6c\x75\x67\x2d\
\x49\x6e\x20\x2e\x20\x53\x56\x47\x20\x56\x65\x72\x73\x69\x6f\x6e\
\x3a\x20\x36\x2e\x30\x30\x20\x42\x75\x69\x6c\x64\x20\x30\x29\x20\
@@ -1643,34 +1363,33 @@ qt_resource_data = b"\
\x77\x33\x2e\x6f\x72\x67\x2f\x47\x72\x61\x70\x68\x69\x63\x73\x2f\
\x53\x56\x47\x2f\x31\x2e\x31\x2f\x44\x54\x44\x2f\x73\x76\x67\x31\
\x31\x2e\x64\x74\x64\x22\x3e\x0a\x3c\x73\x76\x67\x20\x76\x65\x72\
-\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\x3d\x22\x4c\
-\x61\x79\x65\x72\x5f\x31\x22\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\
-\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\
-\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\x6e\x73\
-\x3a\x78\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\
-\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\x78\
-\x6c\x69\x6e\x6b\x22\x20\x78\x3d\x22\x30\x70\x78\x22\x20\x79\x3d\
-\x22\x30\x70\x78\x22\x0a\x09\x20\x77\x69\x64\x74\x68\x3d\x22\x35\
-\x31\x32\x70\x78\x22\x20\x68\x65\x69\x67\x68\x74\x3d\x22\x35\x31\
-\x32\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\x20\
-\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x65\x6e\x61\x62\x6c\
-\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3d\x22\x6e\x65\
-\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x78\
-\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\x72\
-\x76\x65\x22\x3e\x0a\x3c\x67\x20\x69\x64\x3d\x22\x49\x63\x6f\x6e\
-\x5f\x35\x5f\x22\x3e\x0a\x09\x3c\x67\x3e\x0a\x09\x09\x3c\x70\x6f\
-\x6c\x79\x67\x6f\x6e\x20\x70\x6f\x69\x6e\x74\x73\x3d\x22\x34\x30\
-\x35\x2c\x31\x33\x36\x2e\x37\x39\x38\x20\x33\x37\x35\x2e\x32\x30\
-\x32\x2c\x31\x30\x37\x20\x32\x35\x36\x2c\x32\x32\x36\x2e\x32\x30\
-\x32\x20\x31\x33\x36\x2e\x37\x39\x38\x2c\x31\x30\x37\x20\x31\x30\
-\x37\x2c\x31\x33\x36\x2e\x37\x39\x38\x20\x32\x32\x36\x2e\x32\x30\
-\x32\x2c\x32\x35\x36\x20\x31\x30\x37\x2c\x33\x37\x35\x2e\x32\x30\
-\x32\x20\x31\x33\x36\x2e\x37\x39\x38\x2c\x34\x30\x35\x20\x32\x35\
-\x36\x2c\x32\x38\x35\x2e\x37\x39\x38\x20\x0a\x09\x09\x09\x33\x37\
-\x35\x2e\x32\x30\x32\x2c\x34\x30\x35\x20\x34\x30\x35\x2c\x33\x37\
-\x35\x2e\x32\x30\x32\x20\x32\x38\x35\x2e\x37\x39\x38\x2c\x32\x35\
-\x36\x20\x09\x09\x22\x2f\x3e\x0a\x09\x3c\x2f\x67\x3e\x0a\x3c\x2f\
-\x67\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\
+\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\x3d\x22\x53\
+\x61\x76\x65\x22\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\x74\x74\x70\
+\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x32\x30\
+\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\x6e\x73\x3a\x78\x6c\
+\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\
+\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\x78\x6c\x69\x6e\
+\x6b\x22\x20\x78\x3d\x22\x35\x31\x32\x70\x78\x22\x20\x79\x3d\x22\
+\x35\x31\x32\x70\x78\x22\x0a\x09\x20\x76\x69\x65\x77\x42\x6f\x78\
+\x3d\x22\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x65\
+\x6e\x61\x62\x6c\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\
+\x3d\x22\x6e\x65\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\
+\x32\x22\x20\x78\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\
+\x65\x73\x65\x72\x76\x65\x22\x3e\x0a\x3c\x67\x20\x74\x72\x61\x6e\
+\x73\x66\x6f\x72\x6d\x3d\x27\x6d\x61\x74\x72\x69\x78\x28\x32\x34\
+\x20\x30\x20\x30\x20\x32\x34\x20\x30\x20\x30\x29\x27\x3e\x0a\x3c\
+\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x31\x35\x2e\x31\x37\x33\x2c\
+\x32\x48\x34\x43\x32\x2e\x38\x39\x39\x2c\x32\x2c\x32\x2c\x32\x2e\
+\x39\x2c\x32\x2c\x34\x76\x31\x32\x63\x30\x2c\x31\x2e\x31\x2c\x30\
+\x2e\x38\x39\x39\x2c\x32\x2c\x32\x2c\x32\x68\x31\x32\x63\x31\x2e\
+\x31\x30\x31\x2c\x30\x2c\x32\x2d\x30\x2e\x39\x2c\x32\x2d\x32\x56\
+\x35\x2e\x31\x32\x37\x4c\x31\x35\x2e\x31\x37\x33\x2c\x32\x7a\x20\
+\x4d\x31\x34\x2c\x38\x63\x30\x2c\x30\x2e\x35\x34\x39\x2d\x30\x2e\
+\x34\x35\x2c\x31\x2d\x31\x2c\x31\x48\x37\x0a\x09\x43\x36\x2e\x34\
+\x35\x2c\x39\x2c\x36\x2c\x38\x2e\x35\x34\x39\x2c\x36\x2c\x38\x56\
+\x33\x68\x38\x56\x38\x7a\x20\x4d\x31\x33\x2c\x34\x68\x2d\x32\x76\
+\x34\x68\x32\x56\x34\x7a\x22\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\
+\x2f\x73\x76\x67\x3e\x0a\
\x00\x00\x03\x1b\
\x3c\
\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
@@ -1723,32 +1442,7 @@ qt_resource_data = b"\
\x33\x2e\x35\x36\x31\x2c\x33\x31\x31\x2e\x37\x31\x32\x2c\x33\x38\
\x38\x2c\x32\x35\x36\x2c\x33\x38\x38\x7a\x22\x2f\x3e\x0a\x3c\x2f\
\x67\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\
-\x00\x00\x01\x69\
-\x3c\
-\x73\x76\x67\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\
-\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x32\x30\x30\
-\x30\x2f\x73\x76\x67\x22\x20\x77\x69\x64\x74\x68\x3d\x22\x35\x31\
-\x32\x70\x78\x22\x20\x68\x65\x69\x67\x68\x74\x3d\x22\x35\x31\x32\
-\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\x20\x30\
-\x20\x35\x31\x32\x20\x35\x31\x32\x22\x3e\x3c\x67\x20\x74\x72\x61\
-\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x6d\x61\x74\x72\x69\x78\x28\x32\
-\x34\x20\x30\x20\x30\x20\x32\x34\x20\x30\x20\x30\x29\x27\x3e\x3c\
-\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x34\x2e\x33\x34\x20\x31\x35\
-\x2e\x36\x36\x41\x37\x2e\x39\x37\x20\x37\x2e\x39\x37\x20\x30\x20\
-\x30\x20\x30\x20\x39\x20\x31\x37\x2e\x39\x34\x56\x31\x30\x48\x35\
-\x56\x38\x68\x34\x56\x35\x2e\x38\x33\x61\x33\x20\x33\x20\x30\x20\
-\x31\x20\x31\x20\x32\x20\x30\x56\x38\x68\x34\x76\x32\x68\x2d\x34\
-\x76\x37\x2e\x39\x34\x61\x37\x2e\x39\x37\x20\x37\x2e\x39\x37\x20\
-\x30\x20\x30\x20\x30\x20\x34\x2e\x36\x36\x2d\x32\x2e\x32\x38\x6c\
-\x2d\x31\x2e\x34\x32\x2d\x31\x2e\x34\x32\x68\x35\x2e\x36\x36\x6c\
-\x2d\x32\x2e\x38\x33\x20\x32\x2e\x38\x33\x61\x31\x30\x20\x31\x30\
-\x20\x30\x20\x30\x20\x31\x2d\x31\x34\x2e\x31\x34\x20\x30\x4c\x2e\
-\x31\x20\x31\x34\x2e\x32\x34\x68\x35\x2e\x36\x36\x6c\x2d\x31\x2e\
-\x34\x32\x20\x31\x2e\x34\x32\x7a\x4d\x31\x30\x20\x34\x61\x31\x20\
-\x31\x20\x30\x20\x31\x20\x30\x20\x30\x2d\x32\x20\x31\x20\x31\x20\
-\x30\x20\x30\x20\x30\x20\x30\x20\x32\x7a\x22\x2f\x3e\x3c\x2f\x67\
-\x3e\x3c\x2f\x73\x76\x67\x3e\x0a\
-\x00\x00\x02\xc1\
+\x00\x00\x02\xee\
\x3c\
\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
@@ -1779,22 +1473,319 @@ qt_resource_data = b"\
\x3d\x22\x65\x6e\x61\x62\x6c\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\
\x75\x6e\x64\x3a\x6e\x65\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\
\x35\x31\x32\x3b\x22\x20\x78\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\
-\x22\x70\x72\x65\x73\x65\x72\x76\x65\x22\x3e\x0a\x3c\x70\x6f\x6c\
-\x79\x67\x6f\x6e\x20\x70\x6f\x69\x6e\x74\x73\x3d\x22\x34\x38\x30\
-\x2c\x32\x35\x36\x20\x33\x38\x34\x2c\x31\x36\x30\x20\x33\x38\x34\
-\x2c\x32\x33\x36\x20\x32\x37\x36\x2c\x32\x33\x36\x20\x32\x37\x36\
-\x2c\x31\x32\x38\x20\x33\x35\x32\x2c\x31\x32\x38\x20\x32\x35\x36\
-\x2c\x33\x32\x20\x31\x36\x30\x2c\x31\x32\x38\x20\x32\x33\x36\x2c\
-\x31\x32\x38\x20\x32\x33\x36\x2c\x32\x33\x36\x20\x31\x32\x38\x2c\
-\x32\x33\x36\x20\x31\x32\x38\x2c\x31\x36\x30\x20\x33\x32\x2c\x32\
-\x35\x36\x20\x31\x32\x38\x2c\x33\x35\x32\x20\x0a\x09\x31\x32\x38\
-\x2c\x32\x37\x36\x20\x32\x33\x36\x2c\x32\x37\x36\x20\x32\x33\x36\
-\x2c\x33\x38\x34\x20\x31\x36\x30\x2c\x33\x38\x34\x20\x32\x35\x36\
-\x2c\x34\x38\x30\x20\x33\x35\x32\x2c\x33\x38\x34\x20\x32\x37\x35\
-\x2e\x38\x2c\x33\x38\x34\x20\x32\x37\x35\x2e\x34\x2c\x32\x37\x35\
-\x2e\x35\x20\x33\x38\x34\x2c\x32\x37\x35\x2e\x38\x20\x33\x38\x34\
-\x2c\x33\x35\x32\x20\x22\x2f\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\
-\
+\x22\x70\x72\x65\x73\x65\x72\x76\x65\x22\x3e\x0a\x3c\x70\x61\x74\
+\x68\x20\x64\x3d\x22\x4d\x34\x31\x37\x2e\x34\x2c\x32\x32\x34\x48\
+\x32\x38\x38\x56\x39\x34\x2e\x36\x63\x30\x2d\x31\x36\x2e\x39\x2d\
+\x31\x34\x2e\x33\x2d\x33\x30\x2e\x36\x2d\x33\x32\x2d\x33\x30\x2e\
+\x36\x63\x2d\x31\x37\x2e\x37\x2c\x30\x2d\x33\x32\x2c\x31\x33\x2e\
+\x37\x2d\x33\x32\x2c\x33\x30\x2e\x36\x56\x32\x32\x34\x48\x39\x34\
+\x2e\x36\x43\x37\x37\x2e\x37\x2c\x32\x32\x34\x2c\x36\x34\x2c\x32\
+\x33\x38\x2e\x33\x2c\x36\x34\x2c\x32\x35\x36\x0a\x09\x63\x30\x2c\
+\x31\x37\x2e\x37\x2c\x31\x33\x2e\x37\x2c\x33\x32\x2c\x33\x30\x2e\
+\x36\x2c\x33\x32\x48\x32\x32\x34\x76\x31\x32\x39\x2e\x34\x63\x30\
+\x2c\x31\x36\x2e\x39\x2c\x31\x34\x2e\x33\x2c\x33\x30\x2e\x36\x2c\
+\x33\x32\x2c\x33\x30\x2e\x36\x63\x31\x37\x2e\x37\x2c\x30\x2c\x33\
+\x32\x2d\x31\x33\x2e\x37\x2c\x33\x32\x2d\x33\x30\x2e\x36\x56\x32\
+\x38\x38\x68\x31\x32\x39\x2e\x34\x63\x31\x36\x2e\x39\x2c\x30\x2c\
+\x33\x30\x2e\x36\x2d\x31\x34\x2e\x33\x2c\x33\x30\x2e\x36\x2d\x33\
+\x32\x0a\x09\x43\x34\x34\x38\x2c\x32\x33\x38\x2e\x33\x2c\x34\x33\
+\x34\x2e\x33\x2c\x32\x32\x34\x2c\x34\x31\x37\x2e\x34\x2c\x32\x32\
+\x34\x7a\x22\x2f\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\
+\x00\x00\x03\x16\
+\x3c\
+\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
+\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
+\x2d\x38\x22\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\x72\
+\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\x20\x49\x6c\x6c\x75\
+\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x36\x2e\x32\x2e\x31\x2c\x20\
+\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\x50\x6c\x75\x67\x2d\
+\x49\x6e\x20\x2e\x20\x53\x56\x47\x20\x56\x65\x72\x73\x69\x6f\x6e\
+\x3a\x20\x36\x2e\x30\x30\x20\x42\x75\x69\x6c\x64\x20\x30\x29\x20\
+\x20\x2d\x2d\x3e\x0a\x3c\x21\x44\x4f\x43\x54\x59\x50\x45\x20\x73\
+\x76\x67\x20\x50\x55\x42\x4c\x49\x43\x20\x22\x2d\x2f\x2f\x57\x33\
+\x43\x2f\x2f\x44\x54\x44\x20\x53\x56\x47\x20\x31\x2e\x31\x2f\x2f\
+\x45\x4e\x22\x20\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\
+\x77\x33\x2e\x6f\x72\x67\x2f\x47\x72\x61\x70\x68\x69\x63\x73\x2f\
+\x53\x56\x47\x2f\x31\x2e\x31\x2f\x44\x54\x44\x2f\x73\x76\x67\x31\
+\x31\x2e\x64\x74\x64\x22\x3e\x0a\x3c\x73\x76\x67\x20\x76\x65\x72\
+\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\x3d\x22\x4c\
+\x61\x79\x65\x72\x5f\x31\x22\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\
+\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\
+\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\x6e\x73\
+\x3a\x78\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\
+\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\x78\
+\x6c\x69\x6e\x6b\x22\x20\x78\x3d\x22\x30\x70\x78\x22\x20\x79\x3d\
+\x22\x30\x70\x78\x22\x0a\x09\x20\x77\x69\x64\x74\x68\x3d\x22\x35\
+\x31\x32\x70\x78\x22\x20\x68\x65\x69\x67\x68\x74\x3d\x22\x35\x31\
+\x32\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\x20\
+\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x65\x6e\x61\x62\x6c\
+\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3d\x22\x6e\x65\
+\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x78\
+\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\x72\
+\x76\x65\x22\x3e\x0a\x3c\x67\x3e\x0a\x09\x3c\x63\x69\x72\x63\x6c\
+\x65\x20\x63\x78\x3d\x22\x32\x35\x36\x22\x20\x63\x79\x3d\x22\x32\
+\x38\x30\x22\x20\x72\x3d\x22\x36\x33\x22\x2f\x3e\x0a\x09\x3c\x70\
+\x61\x74\x68\x20\x64\x3d\x22\x4d\x34\x34\x30\x2c\x39\x36\x68\x2d\
+\x38\x38\x6c\x2d\x33\x32\x2d\x33\x32\x48\x31\x39\x32\x6c\x2d\x33\
+\x32\x2c\x33\x32\x48\x37\x32\x63\x2d\x32\x32\x2e\x30\x39\x32\x2c\
+\x30\x2d\x34\x30\x2c\x31\x37\x2e\x39\x30\x38\x2d\x34\x30\x2c\x34\
+\x30\x76\x32\x37\x32\x63\x30\x2c\x32\x32\x2e\x30\x39\x32\x2c\x31\
+\x37\x2e\x39\x30\x38\x2c\x34\x30\x2c\x34\x30\x2c\x34\x30\x68\x33\
+\x36\x38\x63\x32\x32\x2e\x30\x39\x32\x2c\x30\x2c\x34\x30\x2d\x31\
+\x37\x2e\x39\x30\x38\x2c\x34\x30\x2d\x34\x30\x0a\x09\x09\x56\x31\
+\x33\x36\x43\x34\x38\x30\x2c\x31\x31\x33\x2e\x39\x30\x38\x2c\x34\
+\x36\x32\x2e\x30\x39\x32\x2c\x39\x36\x2c\x34\x34\x30\x2c\x39\x36\
+\x7a\x20\x4d\x32\x35\x36\x2c\x33\x39\x32\x63\x2d\x36\x31\x2e\x38\
+\x35\x35\x2c\x30\x2d\x31\x31\x32\x2d\x35\x30\x2e\x31\x34\x35\x2d\
+\x31\x31\x32\x2d\x31\x31\x32\x73\x35\x30\x2e\x31\x34\x35\x2d\x31\
+\x31\x32\x2c\x31\x31\x32\x2d\x31\x31\x32\x73\x31\x31\x32\x2c\x35\
+\x30\x2e\x31\x34\x35\x2c\x31\x31\x32\x2c\x31\x31\x32\x0a\x09\x09\
+\x53\x33\x31\x37\x2e\x38\x35\x35\x2c\x33\x39\x32\x2c\x32\x35\x36\
+\x2c\x33\x39\x32\x7a\x22\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\
+\x73\x76\x67\x3e\x0a\
+\x00\x00\x02\xf0\
+\x3c\
+\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
+\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
+\x2d\x38\x22\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\x72\
+\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\x20\x49\x6c\x6c\x75\
+\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x36\x2e\x32\x2e\x31\x2c\x20\
+\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\x50\x6c\x75\x67\x2d\
+\x49\x6e\x20\x2e\x20\x53\x56\x47\x20\x56\x65\x72\x73\x69\x6f\x6e\
+\x3a\x20\x36\x2e\x30\x30\x20\x42\x75\x69\x6c\x64\x20\x30\x29\x20\
+\x20\x2d\x2d\x3e\x0a\x3c\x21\x44\x4f\x43\x54\x59\x50\x45\x20\x73\
+\x76\x67\x20\x50\x55\x42\x4c\x49\x43\x20\x22\x2d\x2f\x2f\x57\x33\
+\x43\x2f\x2f\x44\x54\x44\x20\x53\x56\x47\x20\x31\x2e\x31\x2f\x2f\
+\x45\x4e\x22\x20\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\
+\x77\x33\x2e\x6f\x72\x67\x2f\x47\x72\x61\x70\x68\x69\x63\x73\x2f\
+\x53\x56\x47\x2f\x31\x2e\x31\x2f\x44\x54\x44\x2f\x73\x76\x67\x31\
+\x31\x2e\x64\x74\x64\x22\x3e\x0a\x3c\x73\x76\x67\x20\x76\x65\x72\
+\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\x3d\x22\x4c\
+\x61\x79\x65\x72\x5f\x31\x22\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\
+\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\
+\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\x6e\x73\
+\x3a\x78\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\
+\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\x78\
+\x6c\x69\x6e\x6b\x22\x20\x78\x3d\x22\x30\x70\x78\x22\x20\x79\x3d\
+\x22\x30\x70\x78\x22\x0a\x09\x20\x77\x69\x64\x74\x68\x3d\x22\x35\
+\x31\x32\x70\x78\x22\x20\x68\x65\x69\x67\x68\x74\x3d\x22\x35\x31\
+\x32\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\x20\
+\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x65\x6e\x61\x62\x6c\
+\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3d\x22\x6e\x65\
+\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x78\
+\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\x72\
+\x76\x65\x22\x3e\x0a\x3c\x67\x20\x69\x64\x3d\x22\x49\x63\x6f\x6e\
+\x5f\x32\x30\x5f\x22\x3e\x0a\x09\x3c\x67\x3e\x0a\x09\x09\x3c\x70\
+\x61\x74\x68\x20\x64\x3d\x22\x4d\x32\x35\x36\x2c\x34\x38\x43\x31\
+\x34\x31\x2e\x36\x30\x31\x2c\x34\x38\x2c\x34\x38\x2c\x31\x34\x31\
+\x2e\x36\x30\x31\x2c\x34\x38\x2c\x32\x35\x36\x73\x39\x33\x2e\x36\
+\x30\x31\x2c\x32\x30\x38\x2c\x32\x30\x38\x2c\x32\x30\x38\x73\x32\
+\x30\x38\x2d\x39\x33\x2e\x36\x30\x31\x2c\x32\x30\x38\x2d\x32\x30\
+\x38\x53\x33\x37\x30\x2e\x33\x39\x39\x2c\x34\x38\x2c\x32\x35\x36\
+\x2c\x34\x38\x7a\x20\x4d\x32\x35\x36\x2c\x34\x32\x32\x2e\x33\x39\
+\x39\x0a\x09\x09\x09\x63\x2d\x39\x31\x2e\x35\x31\x38\x2c\x30\x2d\
+\x31\x36\x36\x2e\x33\x39\x39\x2d\x37\x34\x2e\x38\x38\x32\x2d\x31\
+\x36\x36\x2e\x33\x39\x39\x2d\x31\x36\x36\x2e\x33\x39\x39\x53\x31\
+\x36\x34\x2e\x34\x38\x32\x2c\x38\x39\x2e\x36\x2c\x32\x35\x36\x2c\
+\x38\x39\x2e\x36\x53\x34\x32\x32\x2e\x34\x2c\x31\x36\x34\x2e\x34\
+\x38\x32\x2c\x34\x32\x32\x2e\x34\x2c\x32\x35\x36\x53\x33\x34\x37\
+\x2e\x35\x31\x38\x2c\x34\x32\x32\x2e\x33\x39\x39\x2c\x32\x35\x36\
+\x2c\x34\x32\x32\x2e\x33\x39\x39\x7a\x22\x2f\x3e\x0a\x09\x3c\x2f\
+\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\
+\x00\x00\x03\xda\
+\x3c\
+\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
+\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
+\x2d\x38\x22\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\x72\
+\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\x20\x49\x6c\x6c\x75\
+\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x36\x2e\x30\x2e\x30\x2c\x20\
+\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\x50\x6c\x75\x67\x2d\
+\x49\x6e\x20\x2e\x20\x53\x56\x47\x20\x56\x65\x72\x73\x69\x6f\x6e\
+\x3a\x20\x36\x2e\x30\x30\x20\x42\x75\x69\x6c\x64\x20\x30\x29\x20\
+\x20\x2d\x2d\x3e\x0a\x3c\x21\x44\x4f\x43\x54\x59\x50\x45\x20\x73\
+\x76\x67\x20\x50\x55\x42\x4c\x49\x43\x20\x22\x2d\x2f\x2f\x57\x33\
+\x43\x2f\x2f\x44\x54\x44\x20\x53\x56\x47\x20\x31\x2e\x31\x2f\x2f\
+\x45\x4e\x22\x20\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\
+\x77\x33\x2e\x6f\x72\x67\x2f\x47\x72\x61\x70\x68\x69\x63\x73\x2f\
+\x53\x56\x47\x2f\x31\x2e\x31\x2f\x44\x54\x44\x2f\x73\x76\x67\x31\
+\x31\x2e\x64\x74\x64\x22\x3e\x0a\x3c\x73\x76\x67\x20\x76\x65\x72\
+\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\x3d\x22\x4c\
+\x61\x79\x65\x72\x5f\x31\x22\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\
+\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\
+\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\x6e\x73\
+\x3a\x78\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\
+\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\x78\
+\x6c\x69\x6e\x6b\x22\x20\x78\x3d\x22\x30\x70\x78\x22\x20\x79\x3d\
+\x22\x30\x70\x78\x22\x0a\x09\x20\x77\x69\x64\x74\x68\x3d\x22\x35\
+\x31\x32\x70\x78\x22\x20\x68\x65\x69\x67\x68\x74\x3d\x22\x35\x31\
+\x32\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\x20\
+\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x65\x6e\x61\x62\x6c\
+\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3d\x22\x6e\x65\
+\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x78\
+\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\x72\
+\x76\x65\x22\x3e\x0a\x3c\x67\x3e\x0a\x09\x3c\x70\x61\x74\x68\x20\
+\x64\x3d\x22\x4d\x34\x38\x2e\x34\x35\x31\x2c\x34\x36\x34\x2e\x38\
+\x32\x38\x63\x34\x30\x2e\x30\x32\x33\x2d\x30\x2e\x33\x31\x35\x2c\
+\x34\x35\x2e\x30\x31\x2d\x39\x2e\x39\x35\x35\x2c\x35\x38\x2e\x30\
+\x35\x32\x2d\x35\x30\x2e\x31\x33\x32\x63\x32\x34\x2e\x30\x35\x37\
+\x2d\x36\x33\x2e\x34\x30\x38\x2c\x31\x33\x32\x2e\x34\x31\x39\x2c\
+\x31\x36\x2e\x35\x39\x31\x2c\x36\x35\x2e\x32\x36\x39\x2c\x34\x34\
+\x2e\x33\x37\x34\x0a\x09\x09\x43\x31\x30\x34\x2e\x36\x32\x32\x2c\
+\x34\x38\x36\x2e\x38\x35\x32\x2c\x38\x2e\x34\x32\x38\x2c\x34\x36\
+\x35\x2e\x31\x34\x33\x2c\x34\x38\x2e\x34\x35\x31\x2c\x34\x36\x34\
+\x2e\x38\x32\x38\x7a\x22\x2f\x3e\x0a\x09\x3c\x70\x61\x74\x68\x20\
+\x64\x3d\x22\x4d\x34\x35\x38\x2e\x38\x35\x37\x2c\x34\x36\x2e\x39\
+\x30\x32\x63\x2d\x31\x39\x2e\x34\x31\x37\x2d\x31\x35\x2e\x36\x34\
+\x37\x2d\x35\x31\x2e\x35\x39\x32\x2d\x37\x2e\x39\x33\x38\x2d\x37\
+\x31\x2e\x38\x36\x34\x2c\x31\x37\x2e\x32\x31\x39\x4c\x31\x38\x31\
+\x2e\x36\x34\x35\x2c\x33\x35\x35\x2e\x38\x34\x39\x63\x2d\x32\x30\
+\x2e\x32\x37\x32\x2c\x32\x35\x2e\x31\x35\x34\x2d\x32\x30\x2e\x31\
+\x37\x31\x2c\x32\x30\x2e\x33\x34\x37\x2d\x30\x2e\x37\x35\x34\x2c\
+\x33\x35\x2e\x39\x39\x32\x0a\x09\x09\x63\x31\x39\x2e\x34\x31\x37\
+\x2c\x31\x35\x2e\x36\x34\x38\x2c\x31\x34\x2e\x37\x33\x38\x2c\x31\
+\x36\x2e\x37\x37\x2c\x33\x35\x2e\x30\x31\x31\x2d\x38\x2e\x33\x38\
+\x38\x6c\x32\x34\x31\x2e\x34\x30\x36\x2d\x32\x36\x32\x2e\x36\x36\
+\x39\x43\x34\x37\x37\x2e\x35\x38\x31\x2c\x39\x35\x2e\x36\x32\x38\
+\x2c\x34\x37\x38\x2e\x32\x37\x35\x2c\x36\x32\x2e\x35\x35\x2c\x34\
+\x35\x38\x2e\x38\x35\x37\x2c\x34\x36\x2e\x39\x30\x32\x7a\x20\x4d\
+\x34\x30\x36\x2e\x30\x36\x35\x2c\x38\x31\x2e\x38\x32\x35\x0a\x09\
+\x09\x63\x30\x2c\x30\x2d\x33\x2d\x33\x2e\x35\x2d\x31\x33\x2d\x31\
+\x31\x2e\x35\x63\x31\x35\x2d\x32\x34\x2e\x35\x2c\x34\x34\x2e\x35\
+\x2d\x32\x30\x2c\x34\x34\x2e\x35\x2d\x32\x30\x43\x34\x30\x39\x2e\
+\x35\x36\x35\x2c\x36\x36\x2e\x38\x32\x35\x2c\x34\x30\x36\x2e\x30\
+\x36\x35\x2c\x38\x31\x2e\x38\x32\x35\x2c\x34\x30\x36\x2e\x30\x36\
+\x35\x2c\x38\x31\x2e\x38\x32\x35\x7a\x22\x2f\x3e\x0a\x3c\x2f\x67\
+\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\
+\x00\x00\x02\x72\
+\x3c\
+\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
+\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
+\x2d\x38\x22\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\x72\
+\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\x20\x49\x6c\x6c\x75\
+\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x36\x2e\x32\x2e\x31\x2c\x20\
+\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\x50\x6c\x75\x67\x2d\
+\x49\x6e\x20\x2e\x20\x53\x56\x47\x20\x56\x65\x72\x73\x69\x6f\x6e\
+\x3a\x20\x36\x2e\x30\x30\x20\x42\x75\x69\x6c\x64\x20\x30\x29\x20\
+\x20\x2d\x2d\x3e\x0a\x3c\x21\x44\x4f\x43\x54\x59\x50\x45\x20\x73\
+\x76\x67\x20\x50\x55\x42\x4c\x49\x43\x20\x22\x2d\x2f\x2f\x57\x33\
+\x43\x2f\x2f\x44\x54\x44\x20\x53\x56\x47\x20\x31\x2e\x31\x2f\x2f\
+\x45\x4e\x22\x20\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\
+\x77\x33\x2e\x6f\x72\x67\x2f\x47\x72\x61\x70\x68\x69\x63\x73\x2f\
+\x53\x56\x47\x2f\x31\x2e\x31\x2f\x44\x54\x44\x2f\x73\x76\x67\x31\
+\x31\x2e\x64\x74\x64\x22\x3e\x0a\x3c\x73\x76\x67\x20\x76\x65\x72\
+\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\x3d\x22\x4c\
+\x61\x79\x65\x72\x5f\x31\x22\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\
+\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\
+\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\x6e\x73\
+\x3a\x78\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\
+\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\x78\
+\x6c\x69\x6e\x6b\x22\x20\x78\x3d\x22\x30\x70\x78\x22\x20\x79\x3d\
+\x22\x30\x70\x78\x22\x0a\x09\x20\x77\x69\x64\x74\x68\x3d\x22\x35\
+\x31\x32\x70\x78\x22\x20\x68\x65\x69\x67\x68\x74\x3d\x22\x35\x31\
+\x32\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\x20\
+\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x65\x6e\x61\x62\x6c\
+\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3d\x22\x6e\x65\
+\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x78\
+\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\x72\
+\x76\x65\x22\x3e\x0a\x3c\x67\x20\x69\x64\x3d\x22\x49\x63\x6f\x6e\
+\x5f\x38\x5f\x22\x3e\x0a\x09\x3c\x67\x3e\x0a\x09\x09\x3c\x70\x61\
+\x74\x68\x20\x64\x3d\x22\x4d\x34\x32\x37\x2c\x32\x33\x34\x2e\x36\
+\x32\x35\x48\x31\x36\x37\x2e\x32\x39\x36\x6c\x31\x31\x39\x2e\x37\
+\x30\x32\x2d\x31\x31\x39\x2e\x37\x30\x32\x4c\x32\x35\x36\x2c\x38\
+\x35\x4c\x38\x35\x2c\x32\x35\x36\x6c\x31\x37\x31\x2c\x31\x37\x31\
+\x6c\x32\x39\x2e\x39\x32\x32\x2d\x32\x39\x2e\x39\x32\x34\x4c\x31\
+\x36\x37\x2e\x32\x39\x36\x2c\x32\x37\x37\x2e\x33\x37\x35\x48\x34\
+\x32\x37\x56\x32\x33\x34\x2e\x36\x32\x35\x7a\x22\x2f\x3e\x0a\x09\
+\x3c\x2f\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\
+\x0a\
+\x00\x00\x01\xd8\
+\x00\
+\x00\x06\xc4\x78\x9c\xcd\x54\x4d\x6f\x9b\x40\x10\x3d\xe3\x5f\x31\
+\xdd\x5b\x25\xf6\x0b\x62\x62\x53\xe3\xa8\xfe\x90\x65\x29\x6d\x2d\
+\x35\x75\xd5\x53\x85\x61\x0b\x28\x14\x10\x2c\x60\xe7\xd7\x77\x77\
+\xed\x54\xa9\x14\x5f\x43\x0f\x3b\xab\x9d\x79\xf3\xe6\x0d\x4f\x62\
+\x76\x77\xfc\x9d\x43\x27\xea\x26\x2b\x8b\x00\x71\xc2\x10\x88\x22\
+\x2a\xe3\xac\x48\x02\xd4\xca\x5f\x78\x82\xee\xe6\xa3\xd9\x3b\x8c\
+\x61\x23\x0a\x51\x87\xb2\xac\x7d\xf8\x18\x97\x07\x01\xdb\x3c\x6f\
+\x1b\x69\x52\xc0\x3d\xe2\x10\x6e\xc3\xd7\xfd\x06\xd6\xc7\xaa\xac\
+\x25\xec\xf2\x36\xc1\xdb\x02\x88\x49\xee\xcf\x33\x7c\xf0\x08\x63\
+\xb0\x68\xb3\x3c\x06\xf6\x1e\x00\x63\x4d\xbf\xfa\xb2\x7c\xf8\xb1\
+\x5b\x43\xd3\x25\xb0\xfb\xb6\xb8\xdf\x2e\x01\x61\x4a\xbf\xbb\x4b\
+\x4a\x57\x0f\x2b\xc3\xc0\x09\xa7\x74\xfd\x19\x01\x4a\xa5\xac\x7c\
+\x4a\xfb\xbe\x27\xbd\x4b\xca\x3a\xa1\x9b\x3a\xac\xd2\x2c\x6a\xa8\
+\x02\x52\x0d\x54\x4d\x54\x91\x71\x4e\x62\x19\x23\x35\x42\x33\xbf\
+\xd8\x93\x23\xc8\xe2\x00\xdd\x87\x27\x51\xff\x54\x0f\xf5\x19\x8a\
+\x26\x78\x85\xd9\x61\x8c\x69\xa6\x0b\xc4\x3f\xe6\x59\xf1\xf8\x1a\
+\x90\x4f\xa7\x53\x6a\xaa\x0a\x1a\x20\x56\x1d\x11\x9c\xce\xf7\xc8\
+\x82\x3e\x8b\x65\x1a\xa0\x31\x77\x74\x3e\x15\x59\x92\xca\xbf\xcf\
+\x2e\x13\xfd\xa2\xd4\x4d\xc0\x40\xe5\xf4\x41\xd0\xc8\x53\x2e\x02\
+\x24\x8a\xf0\x90\x0b\x7c\x08\xa3\xc7\xa4\x2e\xdb\x22\xf6\x0b\xd1\
+\xc3\x0b\xe4\x07\x23\xcd\x6f\xaa\x30\x52\xf0\xaa\x16\x8d\xa8\x3b\
+\xa1\x77\x4e\xe6\x23\xcb\x04\x6b\x56\x85\x32\x05\xb5\xf0\x27\xee\
+\x31\x9b\x8f\x5d\xe2\x46\xcc\x76\xc9\x2d\x76\x6d\x4f\x45\x75\xf4\
+\x9d\xe2\x31\x23\xe3\x08\xab\x82\xcd\x74\x12\xbb\xf8\x52\xee\xce\
+\x25\x66\x6a\xee\x73\x83\xbe\x53\x53\x30\x2d\x3a\x65\x1b\x46\x7d\
+\xf6\x66\xce\x93\x5a\xdf\xb2\xe8\xbf\x2a\x9c\xc9\xe4\x3f\x50\x71\
+\xc3\xbd\xa1\x54\xcc\xe8\x35\x73\x9c\x09\x7f\x13\x41\x66\xce\x55\
+\x73\x86\x57\xa1\xcd\x19\x48\xc5\x75\x73\x6e\xd8\xf4\x4d\x04\x99\
+\x39\x57\xcd\x19\x5e\x85\x36\x67\x20\x15\xc6\x9c\x4b\x50\xff\xe5\
+\xf9\xe8\x0f\x44\x1a\x94\x79\
+\x00\x00\x03\x5a\
+\x3c\
+\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x27\x31\x2e\
+\x30\x27\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x27\x55\x54\x46\
+\x2d\x38\x27\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x54\x68\x69\x73\x20\
+\x66\x69\x6c\x65\x20\x77\x61\x73\x20\x67\x65\x6e\x65\x72\x61\x74\
+\x65\x64\x20\x62\x79\x20\x64\x76\x69\x73\x76\x67\x6d\x20\x32\x2e\
+\x31\x31\x2e\x31\x20\x2d\x2d\x3e\x0a\x3c\x73\x76\x67\x20\x76\x65\
+\x72\x73\x69\x6f\x6e\x3d\x27\x31\x2e\x31\x27\x20\x78\x6d\x6c\x6e\
+\x73\x3d\x27\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\
+\x2e\x6f\x72\x67\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x27\x20\x78\
+\x6d\x6c\x6e\x73\x3a\x78\x6c\x69\x6e\x6b\x3d\x27\x68\x74\x74\x70\
+\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\
+\x39\x39\x2f\x78\x6c\x69\x6e\x6b\x27\x20\x77\x69\x64\x74\x68\x3d\
+\x27\x36\x33\x2e\x39\x39\x39\x36\x70\x74\x27\x20\x68\x65\x69\x67\
+\x68\x74\x3d\x27\x36\x34\x70\x74\x27\x20\x76\x69\x65\x77\x42\x6f\
+\x78\x3d\x27\x35\x36\x2e\x34\x30\x39\x34\x20\x31\x31\x37\x2e\x38\
+\x35\x38\x20\x36\x33\x2e\x39\x39\x39\x36\x20\x36\x34\x27\x3e\x0a\
+\x3c\x67\x20\x69\x64\x3d\x27\x70\x61\x67\x65\x31\x27\x3e\x0a\x3c\
+\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x74\x72\x61\
+\x6e\x73\x6c\x61\x74\x65\x28\x35\x36\x2e\x34\x30\x39\x34\x20\x31\
+\x31\x37\x2e\x38\x35\x38\x29\x73\x63\x61\x6c\x65\x28\x2e\x39\x39\
+\x36\x32\x36\x34\x29\x27\x3e\x0a\x3c\x70\x61\x74\x68\x20\x64\x3d\
+\x27\x4d\x20\x32\x2e\x30\x30\x37\x35\x20\x36\x32\x2e\x32\x33\x32\
+\x35\x4c\x20\x36\x32\x2e\x32\x33\x32\x35\x20\x36\x32\x2e\x32\x33\
+\x32\x35\x4c\x20\x36\x32\x2e\x32\x33\x32\x35\x20\x32\x2e\x30\x30\
+\x37\x35\x4c\x20\x32\x2e\x30\x30\x37\x35\x20\x32\x2e\x30\x30\x37\
+\x35\x4c\x20\x32\x2e\x30\x30\x37\x35\x20\x36\x32\x2e\x32\x33\x32\
+\x35\x5a\x27\x20\x66\x69\x6c\x6c\x3d\x27\x6e\x6f\x6e\x65\x27\x20\
+\x73\x74\x72\x6f\x6b\x65\x3d\x27\x23\x30\x30\x30\x30\x30\x30\x27\
+\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6c\x69\x6e\x65\x63\x61\x70\x3d\
+\x27\x72\x6f\x75\x6e\x64\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6c\
+\x69\x6e\x65\x6a\x6f\x69\x6e\x3d\x27\x72\x6f\x75\x6e\x64\x27\x20\
+\x73\x74\x72\x6f\x6b\x65\x2d\x6d\x69\x74\x65\x72\x6c\x69\x6d\x69\
+\x74\x3d\x27\x31\x30\x2e\x30\x33\x37\x35\x27\x20\x73\x74\x72\x6f\
+\x6b\x65\x2d\x77\x69\x64\x74\x68\x3d\x27\x34\x2e\x30\x31\x35\x27\
+\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\x20\x74\x72\x61\x6e\x73\
+\x66\x6f\x72\x6d\x3d\x27\x74\x72\x61\x6e\x73\x6c\x61\x74\x65\x28\
+\x35\x36\x2e\x34\x30\x39\x34\x20\x31\x31\x37\x2e\x38\x35\x38\x29\
+\x73\x63\x61\x6c\x65\x28\x2e\x39\x39\x36\x32\x36\x34\x29\x27\x3e\
+\x0a\x3c\x70\x61\x74\x68\x20\x64\x3d\x27\x4d\x20\x34\x37\x2e\x31\
+\x37\x36\x32\x20\x33\x32\x2e\x31\x32\x43\x20\x34\x37\x2e\x31\x37\
+\x36\x32\x20\x32\x33\x2e\x38\x30\x34\x37\x20\x34\x30\x2e\x34\x33\
+\x35\x33\x20\x31\x37\x2e\x30\x36\x33\x37\x20\x33\x32\x2e\x31\x32\
+\x20\x31\x37\x2e\x30\x36\x33\x37\x43\x20\x32\x33\x2e\x38\x30\x34\
+\x37\x20\x31\x37\x2e\x30\x36\x33\x37\x20\x31\x37\x2e\x30\x36\x33\
+\x37\x20\x32\x33\x2e\x38\x30\x34\x37\x20\x31\x37\x2e\x30\x36\x33\
+\x37\x20\x33\x32\x2e\x31\x32\x43\x20\x31\x37\x2e\x30\x36\x33\x37\
+\x20\x34\x30\x2e\x34\x33\x35\x33\x20\x32\x33\x2e\x38\x30\x34\x37\
+\x20\x34\x37\x2e\x31\x37\x36\x32\x20\x33\x32\x2e\x31\x32\x20\x34\
+\x37\x2e\x31\x37\x36\x32\x43\x20\x34\x30\x2e\x34\x33\x35\x33\x20\
+\x34\x37\x2e\x31\x37\x36\x32\x20\x34\x37\x2e\x31\x37\x36\x32\x20\
+\x34\x30\x2e\x34\x33\x35\x33\x20\x34\x37\x2e\x31\x37\x36\x32\x20\
+\x33\x32\x2e\x31\x32\x5a\x27\x20\x66\x69\x6c\x6c\x3d\x27\x23\x30\
+\x30\x30\x30\x30\x30\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\
+\x67\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\
\x00\x00\x02\x1c\
\x00\
\x00\x07\x5c\x78\x9c\xdd\x55\x4d\x73\x9b\x30\x10\xbd\xf7\x57\x6c\
@@ -1831,39 +1822,7 @@ qt_resource_data = b"\
\xeb\xd5\x2d\xb2\x5f\x08\x95\x30\x76\xde\x22\x9c\x26\x32\x91\x7e\
\x8b\x4e\xe8\x62\x8b\x5c\xd8\xcf\xc6\xcb\x17\xef\xc3\x7f\xd3\xba\
\xd3\xc5\x7e\xcc\xee\x7e\x01\xb3\x30\xdb\xa9\
-\x00\x00\x01\xd8\
-\x00\
-\x00\x06\xc4\x78\x9c\xcd\x54\x4d\x6f\x9b\x40\x10\x3d\xe3\x5f\x31\
-\xdd\x5b\x25\xf6\x0b\x62\x62\x53\xe3\xa8\xfe\x90\x65\x29\x6d\x2d\
-\x35\x75\xd5\x53\x85\x61\x0b\x28\x14\x10\x2c\x60\xe7\xd7\x77\x77\
-\xed\x54\xa9\x14\x5f\x43\x0f\x3b\xab\x9d\x79\xf3\xe6\x0d\x4f\x62\
-\x76\x77\xfc\x9d\x43\x27\xea\x26\x2b\x8b\x00\x71\xc2\x10\x88\x22\
-\x2a\xe3\xac\x48\x02\xd4\xca\x5f\x78\x82\xee\xe6\xa3\xd9\x3b\x8c\
-\x61\x23\x0a\x51\x87\xb2\xac\x7d\xf8\x18\x97\x07\x01\xdb\x3c\x6f\
-\x1b\x69\x52\xc0\x3d\xe2\x10\x6e\xc3\xd7\xfd\x06\xd6\xc7\xaa\xac\
-\x25\xec\xf2\x36\xc1\xdb\x02\x88\x49\xee\xcf\x33\x7c\xf0\x08\x63\
-\xb0\x68\xb3\x3c\x06\xf6\x1e\x00\x63\x4d\xbf\xfa\xb2\x7c\xf8\xb1\
-\x5b\x43\xd3\x25\xb0\xfb\xb6\xb8\xdf\x2e\x01\x61\x4a\xbf\xbb\x4b\
-\x4a\x57\x0f\x2b\xc3\xc0\x09\xa7\x74\xfd\x19\x01\x4a\xa5\xac\x7c\
-\x4a\xfb\xbe\x27\xbd\x4b\xca\x3a\xa1\x9b\x3a\xac\xd2\x2c\x6a\xa8\
-\x02\x52\x0d\x54\x4d\x54\x91\x71\x4e\x62\x19\x23\x35\x42\x33\xbf\
-\xd8\x93\x23\xc8\xe2\x00\xdd\x87\x27\x51\xff\x54\x0f\xf5\x19\x8a\
-\x26\x78\x85\xd9\x61\x8c\x69\xa6\x0b\xc4\x3f\xe6\x59\xf1\xf8\x1a\
-\x90\x4f\xa7\x53\x6a\xaa\x0a\x1a\x20\x56\x1d\x11\x9c\xce\xf7\xc8\
-\x82\x3e\x8b\x65\x1a\xa0\x31\x77\x74\x3e\x15\x59\x92\xca\xbf\xcf\
-\x2e\x13\xfd\xa2\xd4\x4d\xc0\x40\xe5\xf4\x41\xd0\xc8\x53\x2e\x02\
-\x24\x8a\xf0\x90\x0b\x7c\x08\xa3\xc7\xa4\x2e\xdb\x22\xf6\x0b\xd1\
-\xc3\x0b\xe4\x07\x23\xcd\x6f\xaa\x30\x52\xf0\xaa\x16\x8d\xa8\x3b\
-\xa1\x77\x4e\xe6\x23\xcb\x04\x6b\x56\x85\x32\x05\xb5\xf0\x27\xee\
-\x31\x9b\x8f\x5d\xe2\x46\xcc\x76\xc9\x2d\x76\x6d\x4f\x45\x75\xf4\
-\x9d\xe2\x31\x23\xe3\x08\xab\x82\xcd\x74\x12\xbb\xf8\x52\xee\xce\
-\x25\x66\x6a\xee\x73\x83\xbe\x53\x53\x30\x2d\x3a\x65\x1b\x46\x7d\
-\xf6\x66\xce\x93\x5a\xdf\xb2\xe8\xbf\x2a\x9c\xc9\xe4\x3f\x50\x71\
-\xc3\xbd\xa1\x54\xcc\xe8\x35\x73\x9c\x09\x7f\x13\x41\x66\xce\x55\
-\x73\x86\x57\xa1\xcd\x19\x48\xc5\x75\x73\x6e\xd8\xf4\x4d\x04\x99\
-\x39\x57\xcd\x19\x5e\x85\x36\x67\x20\x15\xc6\x9c\x4b\x50\xff\xe5\
-\xf9\xe8\x0f\x44\x1a\x94\x79\
-\x00\x00\x02\x98\
+\x00\x00\x03\x3f\
\x3c\
\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
@@ -1894,20 +1853,101 @@ qt_resource_data = b"\
\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3d\x22\x6e\x65\
\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x78\
\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\x72\
-\x76\x65\x22\x3e\x0a\x3c\x67\x3e\x0a\x09\x3c\x70\x61\x74\x68\x20\
-\x64\x3d\x22\x4d\x31\x32\x38\x2c\x34\x30\x35\x2e\x34\x32\x39\x43\
-\x31\x32\x38\x2c\x34\x32\x38\x2e\x38\x34\x36\x2c\x31\x34\x37\x2e\
-\x31\x39\x38\x2c\x34\x34\x38\x2c\x31\x37\x30\x2e\x36\x36\x37\x2c\
-\x34\x34\x38\x68\x31\x37\x30\x2e\x36\x36\x37\x43\x33\x36\x34\x2e\
-\x38\x30\x32\x2c\x34\x34\x38\x2c\x33\x38\x34\x2c\x34\x32\x38\x2e\
-\x38\x34\x36\x2c\x33\x38\x34\x2c\x34\x30\x35\x2e\x34\x32\x39\x56\
-\x31\x36\x30\x48\x31\x32\x38\x56\x34\x30\x35\x2e\x34\x32\x39\x7a\
-\x20\x4d\x34\x31\x36\x2c\x39\x36\x0a\x09\x09\x68\x2d\x38\x30\x6c\
-\x2d\x32\x36\x2e\x37\x38\x35\x2d\x33\x32\x48\x32\x30\x32\x2e\x37\
-\x38\x36\x4c\x31\x37\x36\x2c\x39\x36\x48\x39\x36\x76\x33\x32\x68\
-\x33\x32\x30\x56\x39\x36\x7a\x22\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\
-\x3c\x2f\x73\x76\x67\x3e\x0a\
-\x00\x00\x03\x5a\
+\x76\x65\x22\x3e\x0a\x3c\x67\x20\x69\x64\x3d\x22\x49\x63\x6f\x6e\
+\x5f\x32\x31\x5f\x22\x3e\x0a\x09\x3c\x67\x3e\x0a\x09\x09\x3c\x70\
+\x61\x74\x68\x20\x64\x3d\x22\x4d\x32\x35\x36\x2c\x31\x35\x32\x63\
+\x2d\x35\x37\x2e\x32\x2c\x30\x2d\x31\x30\x34\x2c\x34\x36\x2e\x38\
+\x2d\x31\x30\x34\x2c\x31\x30\x34\x73\x34\x36\x2e\x38\x2c\x31\x30\
+\x34\x2c\x31\x30\x34\x2c\x31\x30\x34\x73\x31\x30\x34\x2d\x34\x36\
+\x2e\x38\x2c\x31\x30\x34\x2d\x31\x30\x34\x53\x33\x31\x33\x2e\x32\
+\x2c\x31\x35\x32\x2c\x32\x35\x36\x2c\x31\x35\x32\x7a\x20\x4d\x32\
+\x35\x36\x2c\x34\x38\x0a\x09\x09\x09\x43\x31\x34\x31\x2e\x36\x30\
+\x31\x2c\x34\x38\x2c\x34\x38\x2c\x31\x34\x31\x2e\x36\x30\x31\x2c\
+\x34\x38\x2c\x32\x35\x36\x73\x39\x33\x2e\x36\x30\x31\x2c\x32\x30\
+\x38\x2c\x32\x30\x38\x2c\x32\x30\x38\x73\x32\x30\x38\x2d\x39\x33\
+\x2e\x36\x30\x31\x2c\x32\x30\x38\x2d\x32\x30\x38\x53\x33\x37\x30\
+\x2e\x33\x39\x39\x2c\x34\x38\x2c\x32\x35\x36\x2c\x34\x38\x7a\x20\
+\x4d\x32\x35\x36\x2c\x34\x32\x32\x2e\x34\x0a\x09\x09\x09\x63\x2d\
+\x39\x31\x2e\x35\x31\x38\x2c\x30\x2d\x31\x36\x36\x2e\x34\x2d\x37\
+\x34\x2e\x38\x38\x33\x2d\x31\x36\x36\x2e\x34\x2d\x31\x36\x36\x2e\
+\x34\x53\x31\x36\x34\x2e\x34\x38\x32\x2c\x38\x39\x2e\x36\x2c\x32\
+\x35\x36\x2c\x38\x39\x2e\x36\x53\x34\x32\x32\x2e\x34\x2c\x31\x36\
+\x34\x2e\x34\x38\x32\x2c\x34\x32\x32\x2e\x34\x2c\x32\x35\x36\x53\
+\x33\x34\x37\x2e\x35\x31\x38\x2c\x34\x32\x32\x2e\x34\x2c\x32\x35\
+\x36\x2c\x34\x32\x32\x2e\x34\x7a\x22\x2f\x3e\x0a\x09\x3c\x2f\x67\
+\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\
+\x00\x00\x03\xb7\
+\x3c\
+\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
+\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
+\x2d\x38\x22\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\x72\
+\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\x20\x49\x6c\x6c\x75\
+\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x38\x2e\x31\x2e\x30\x2c\x20\
+\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\x50\x6c\x75\x67\x2d\
+\x49\x6e\x20\x2e\x20\x53\x56\x47\x20\x56\x65\x72\x73\x69\x6f\x6e\
+\x3a\x20\x36\x2e\x30\x30\x20\x42\x75\x69\x6c\x64\x20\x30\x29\x20\
+\x20\x2d\x2d\x3e\x0a\x3c\x21\x44\x4f\x43\x54\x59\x50\x45\x20\x73\
+\x76\x67\x20\x50\x55\x42\x4c\x49\x43\x20\x22\x2d\x2f\x2f\x57\x33\
+\x43\x2f\x2f\x44\x54\x44\x20\x53\x56\x47\x20\x31\x2e\x31\x2f\x2f\
+\x45\x4e\x22\x20\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\
+\x77\x33\x2e\x6f\x72\x67\x2f\x47\x72\x61\x70\x68\x69\x63\x73\x2f\
+\x53\x56\x47\x2f\x31\x2e\x31\x2f\x44\x54\x44\x2f\x73\x76\x67\x31\
+\x31\x2e\x64\x74\x64\x22\x3e\x0a\x3c\x73\x76\x67\x20\x76\x65\x72\
+\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\x3d\x22\x4d\
+\x61\x67\x6e\x69\x66\x79\x69\x6e\x67\x5f\x67\x6c\x61\x73\x73\x22\
+\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\
+\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x32\x30\x30\x30\x2f\x73\
+\x76\x67\x22\x20\x78\x6d\x6c\x6e\x73\x3a\x78\x6c\x69\x6e\x6b\x3d\
+\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\
+\x72\x67\x2f\x31\x39\x39\x39\x2f\x78\x6c\x69\x6e\x6b\x22\x20\x78\
+\x3d\x22\x30\x70\x78\x22\x0a\x09\x20\x79\x3d\x22\x30\x70\x78\x22\
+\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\x20\x30\x20\x35\x31\
+\x32\x20\x35\x31\x32\x22\x20\x65\x6e\x61\x62\x6c\x65\x2d\x62\x61\
+\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3d\x22\x6e\x65\x77\x20\x30\x20\
+\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x78\x6d\x6c\x3a\x73\
+\x70\x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\x72\x76\x65\x22\x3e\
+\x0a\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x6d\
+\x61\x74\x72\x69\x78\x28\x32\x34\x20\x30\x20\x30\x20\x32\x34\x20\
+\x30\x20\x30\x29\x27\x3e\x0a\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\
+\x4d\x31\x37\x2e\x35\x34\x35\x2c\x31\x35\x2e\x34\x36\x37\x6c\x2d\
+\x33\x2e\x37\x37\x39\x2d\x33\x2e\x37\x37\x39\x63\x30\x2e\x35\x37\
+\x2d\x30\x2e\x39\x33\x35\x2c\x30\x2e\x38\x39\x38\x2d\x32\x2e\x30\
+\x33\x35\x2c\x30\x2e\x38\x39\x38\x2d\x33\x2e\x32\x31\x63\x30\x2d\
+\x33\x2e\x34\x31\x37\x2d\x32\x2e\x39\x36\x31\x2d\x36\x2e\x33\x37\
+\x37\x2d\x36\x2e\x33\x37\x38\x2d\x36\x2e\x33\x37\x37\x0a\x09\x43\
+\x34\x2e\x38\x36\x39\x2c\x32\x2e\x31\x2c\x32\x2e\x31\x2c\x34\x2e\
+\x38\x37\x2c\x32\x2e\x31\x2c\x38\x2e\x32\x38\x37\x63\x30\x2c\x33\
+\x2e\x34\x31\x36\x2c\x32\x2e\x39\x36\x31\x2c\x36\x2e\x33\x37\x37\
+\x2c\x36\x2e\x33\x37\x37\x2c\x36\x2e\x33\x37\x37\x63\x31\x2e\x31\
+\x33\x37\x2c\x30\x2c\x32\x2e\x32\x2d\x30\x2e\x33\x30\x39\x2c\x33\
+\x2e\x31\x31\x35\x2d\x30\x2e\x38\x34\x34\x6c\x33\x2e\x37\x39\x39\
+\x2c\x33\x2e\x38\x30\x31\x0a\x09\x63\x30\x2e\x33\x37\x32\x2c\x30\
+\x2e\x33\x37\x31\x2c\x30\x2e\x39\x37\x35\x2c\x30\x2e\x33\x37\x31\
+\x2c\x31\x2e\x33\x34\x36\x2c\x30\x6c\x30\x2e\x39\x34\x33\x2d\x30\
+\x2e\x39\x34\x33\x43\x31\x38\x2e\x30\x35\x31\x2c\x31\x36\x2e\x33\
+\x30\x37\x2c\x31\x37\x2e\x39\x31\x36\x2c\x31\x35\x2e\x38\x33\x38\
+\x2c\x31\x37\x2e\x35\x34\x35\x2c\x31\x35\x2e\x34\x36\x37\x7a\x20\
+\x4d\x34\x2e\x30\x30\x34\x2c\x38\x2e\x32\x38\x37\x0a\x09\x63\x30\
+\x2d\x32\x2e\x33\x36\x36\x2c\x31\x2e\x39\x31\x37\x2d\x34\x2e\x32\
+\x38\x33\x2c\x34\x2e\x32\x38\x32\x2d\x34\x2e\x32\x38\x33\x63\x32\
+\x2e\x33\x36\x36\x2c\x30\x2c\x34\x2e\x34\x37\x34\x2c\x32\x2e\x31\
+\x30\x37\x2c\x34\x2e\x34\x37\x34\x2c\x34\x2e\x34\x37\x34\x63\x30\
+\x2c\x32\x2e\x33\x36\x35\x2d\x31\x2e\x39\x31\x38\x2c\x34\x2e\x32\
+\x38\x33\x2d\x34\x2e\x32\x38\x33\x2c\x34\x2e\x32\x38\x33\x0a\x09\
+\x43\x36\x2e\x31\x31\x31\x2c\x31\x32\x2e\x37\x36\x2c\x34\x2e\x30\
+\x30\x34\x2c\x31\x30\x2e\x36\x35\x32\x2c\x34\x2e\x30\x30\x34\x2c\
+\x38\x2e\x32\x38\x37\x7a\x22\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\
+\x2f\x73\x76\x67\x3e\x0a\
+\x00\x00\x00\x6c\
+\x3c\
+\x73\x76\x67\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\
+\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x32\x30\x30\
+\x30\x2f\x73\x76\x67\x22\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\
+\x30\x20\x30\x20\x32\x30\x20\x32\x30\x22\x3e\x3c\x70\x61\x74\x68\
+\x20\x64\x3d\x22\x4d\x31\x38\x20\x31\x32\x76\x31\x48\x38\x76\x35\
+\x6c\x2d\x36\x2d\x36\x20\x36\x2d\x36\x76\x35\x68\x38\x56\x32\x68\
+\x32\x7a\x22\x2f\x3e\x3c\x2f\x73\x76\x67\x3e\
+\x00\x00\x04\x13\
\x3c\
\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x27\x31\x2e\
\x30\x27\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x27\x55\x54\x46\
@@ -1921,49 +1961,129 @@ qt_resource_data = b"\
\x6d\x6c\x6e\x73\x3a\x78\x6c\x69\x6e\x6b\x3d\x27\x68\x74\x74\x70\
\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\
\x39\x39\x2f\x78\x6c\x69\x6e\x6b\x27\x20\x77\x69\x64\x74\x68\x3d\
-\x27\x36\x33\x2e\x39\x39\x39\x36\x70\x74\x27\x20\x68\x65\x69\x67\
+\x27\x36\x34\x2e\x30\x30\x30\x31\x70\x74\x27\x20\x68\x65\x69\x67\
\x68\x74\x3d\x27\x36\x34\x70\x74\x27\x20\x76\x69\x65\x77\x42\x6f\
-\x78\x3d\x27\x35\x36\x2e\x34\x30\x39\x34\x20\x31\x31\x37\x2e\x38\
-\x35\x38\x20\x36\x33\x2e\x39\x39\x39\x36\x20\x36\x34\x27\x3e\x0a\
+\x78\x3d\x27\x35\x38\x2e\x34\x36\x36\x39\x20\x31\x31\x37\x2e\x38\
+\x35\x38\x20\x36\x34\x2e\x30\x30\x30\x31\x20\x36\x34\x27\x3e\x0a\
\x3c\x67\x20\x69\x64\x3d\x27\x70\x61\x67\x65\x31\x27\x3e\x0a\x3c\
\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x74\x72\x61\
-\x6e\x73\x6c\x61\x74\x65\x28\x35\x36\x2e\x34\x30\x39\x34\x20\x31\
+\x6e\x73\x6c\x61\x74\x65\x28\x35\x38\x2e\x34\x36\x36\x39\x20\x31\
\x31\x37\x2e\x38\x35\x38\x29\x73\x63\x61\x6c\x65\x28\x2e\x39\x39\
\x36\x32\x36\x34\x29\x27\x3e\x0a\x3c\x70\x61\x74\x68\x20\x64\x3d\
-\x27\x4d\x20\x32\x2e\x30\x30\x37\x35\x20\x36\x32\x2e\x32\x33\x32\
-\x35\x4c\x20\x36\x32\x2e\x32\x33\x32\x35\x20\x36\x32\x2e\x32\x33\
-\x32\x35\x4c\x20\x36\x32\x2e\x32\x33\x32\x35\x20\x32\x2e\x30\x30\
-\x37\x35\x4c\x20\x32\x2e\x30\x30\x37\x35\x20\x32\x2e\x30\x30\x37\
-\x35\x4c\x20\x32\x2e\x30\x30\x37\x35\x20\x36\x32\x2e\x32\x33\x32\
-\x35\x5a\x27\x20\x66\x69\x6c\x6c\x3d\x27\x6e\x6f\x6e\x65\x27\x20\
+\x27\x4d\x20\x36\x2e\x30\x32\x32\x35\x20\x33\x32\x2e\x31\x32\x4c\
+\x20\x31\x33\x2e\x39\x36\x38\x37\x20\x31\x32\x2e\x39\x33\x36\x31\
+\x4c\x20\x35\x38\x2e\x32\x31\x37\x35\x20\x32\x31\x2e\x37\x33\x37\
+\x38\x4c\x20\x34\x32\x2e\x37\x34\x34\x35\x20\x34\x31\x2e\x37\x31\
+\x31\x39\x27\x20\x66\x69\x6c\x6c\x3d\x27\x6e\x6f\x6e\x65\x27\x20\
\x73\x74\x72\x6f\x6b\x65\x3d\x27\x23\x30\x30\x30\x30\x30\x30\x27\
\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6c\x69\x6e\x65\x63\x61\x70\x3d\
\x27\x72\x6f\x75\x6e\x64\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6c\
\x69\x6e\x65\x6a\x6f\x69\x6e\x3d\x27\x72\x6f\x75\x6e\x64\x27\x20\
\x73\x74\x72\x6f\x6b\x65\x2d\x6d\x69\x74\x65\x72\x6c\x69\x6d\x69\
\x74\x3d\x27\x31\x30\x2e\x30\x33\x37\x35\x27\x20\x73\x74\x72\x6f\
-\x6b\x65\x2d\x77\x69\x64\x74\x68\x3d\x27\x34\x2e\x30\x31\x35\x27\
-\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\x20\x74\x72\x61\x6e\x73\
-\x66\x6f\x72\x6d\x3d\x27\x74\x72\x61\x6e\x73\x6c\x61\x74\x65\x28\
-\x35\x36\x2e\x34\x30\x39\x34\x20\x31\x31\x37\x2e\x38\x35\x38\x29\
-\x73\x63\x61\x6c\x65\x28\x2e\x39\x39\x36\x32\x36\x34\x29\x27\x3e\
-\x0a\x3c\x70\x61\x74\x68\x20\x64\x3d\x27\x4d\x20\x34\x37\x2e\x31\
-\x37\x36\x32\x20\x33\x32\x2e\x31\x32\x43\x20\x34\x37\x2e\x31\x37\
-\x36\x32\x20\x32\x33\x2e\x38\x30\x34\x37\x20\x34\x30\x2e\x34\x33\
-\x35\x33\x20\x31\x37\x2e\x30\x36\x33\x37\x20\x33\x32\x2e\x31\x32\
-\x20\x31\x37\x2e\x30\x36\x33\x37\x43\x20\x32\x33\x2e\x38\x30\x34\
-\x37\x20\x31\x37\x2e\x30\x36\x33\x37\x20\x31\x37\x2e\x30\x36\x33\
-\x37\x20\x32\x33\x2e\x38\x30\x34\x37\x20\x31\x37\x2e\x30\x36\x33\
-\x37\x20\x33\x32\x2e\x31\x32\x43\x20\x31\x37\x2e\x30\x36\x33\x37\
-\x20\x34\x30\x2e\x34\x33\x35\x33\x20\x32\x33\x2e\x38\x30\x34\x37\
-\x20\x34\x37\x2e\x31\x37\x36\x32\x20\x33\x32\x2e\x31\x32\x20\x34\
-\x37\x2e\x31\x37\x36\x32\x43\x20\x34\x30\x2e\x34\x33\x35\x33\x20\
-\x34\x37\x2e\x31\x37\x36\x32\x20\x34\x37\x2e\x31\x37\x36\x32\x20\
-\x34\x30\x2e\x34\x33\x35\x33\x20\x34\x37\x2e\x31\x37\x36\x32\x20\
-\x33\x32\x2e\x31\x32\x5a\x27\x20\x66\x69\x6c\x6c\x3d\x27\x23\x30\
-\x30\x30\x30\x30\x30\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\
-\x67\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\
-\x00\x00\x03\x5f\
+\x6b\x65\x2d\x77\x69\x64\x74\x68\x3d\x27\x32\x2e\x35\x30\x39\x33\
+\x37\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\x20\x74\x72\x61\
+\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x74\x72\x61\x6e\x73\x6c\x61\x74\
+\x65\x28\x35\x38\x2e\x34\x36\x36\x39\x20\x31\x31\x37\x2e\x38\x35\
+\x38\x29\x73\x63\x61\x6c\x65\x28\x2e\x39\x39\x36\x32\x36\x34\x29\
+\x27\x3e\x0a\x3c\x63\x69\x72\x63\x6c\x65\x20\x63\x78\x3d\x27\x36\
+\x2e\x30\x32\x32\x35\x27\x20\x63\x79\x3d\x27\x33\x32\x2e\x31\x32\
+\x27\x20\x66\x69\x6c\x6c\x3d\x27\x23\x66\x66\x30\x30\x30\x30\x27\
+\x20\x72\x3d\x27\x36\x2e\x30\x32\x32\x35\x27\x2f\x3e\x0a\x3c\x2f\
+\x67\x3e\x0a\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\
+\x27\x74\x72\x61\x6e\x73\x6c\x61\x74\x65\x28\x35\x38\x2e\x34\x36\
+\x36\x39\x20\x31\x31\x37\x2e\x38\x35\x38\x29\x73\x63\x61\x6c\x65\
+\x28\x2e\x39\x39\x36\x32\x36\x34\x29\x27\x3e\x0a\x3c\x63\x69\x72\
+\x63\x6c\x65\x20\x63\x78\x3d\x27\x31\x33\x2e\x39\x36\x38\x37\x27\
+\x20\x63\x79\x3d\x27\x31\x32\x2e\x39\x33\x36\x31\x27\x20\x66\x69\
+\x6c\x6c\x3d\x27\x23\x66\x66\x30\x30\x30\x30\x27\x20\x72\x3d\x27\
+\x36\x2e\x30\x32\x32\x35\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\
+\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x74\x72\x61\
+\x6e\x73\x6c\x61\x74\x65\x28\x35\x38\x2e\x34\x36\x36\x39\x20\x31\
+\x31\x37\x2e\x38\x35\x38\x29\x73\x63\x61\x6c\x65\x28\x2e\x39\x39\
+\x36\x32\x36\x34\x29\x27\x3e\x0a\x3c\x63\x69\x72\x63\x6c\x65\x20\
+\x63\x78\x3d\x27\x35\x38\x2e\x32\x31\x37\x35\x27\x20\x63\x79\x3d\
+\x27\x32\x31\x2e\x37\x33\x37\x38\x27\x20\x66\x69\x6c\x6c\x3d\x27\
+\x23\x66\x66\x30\x30\x30\x30\x27\x20\x72\x3d\x27\x36\x2e\x30\x32\
+\x32\x35\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\x20\x74\x72\
+\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x74\x72\x61\x6e\x73\x6c\x61\
+\x74\x65\x28\x35\x38\x2e\x34\x36\x36\x39\x20\x31\x31\x37\x2e\x38\
+\x35\x38\x29\x73\x63\x61\x6c\x65\x28\x2e\x39\x39\x36\x32\x36\x34\
+\x29\x27\x3e\x0a\x3c\x63\x69\x72\x63\x6c\x65\x20\x63\x78\x3d\x27\
+\x34\x32\x2e\x37\x34\x34\x35\x27\x20\x63\x79\x3d\x27\x34\x31\x2e\
+\x37\x31\x31\x39\x27\x20\x66\x69\x6c\x6c\x3d\x27\x23\x66\x66\x30\
+\x30\x30\x30\x27\x20\x72\x3d\x27\x36\x2e\x30\x32\x32\x35\x27\x2f\
+\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\
+\x67\x3e\
+\x00\x00\x04\x17\
+\x3c\
+\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
+\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x69\x73\x6f\
+\x2d\x38\x38\x35\x39\x2d\x31\x22\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\
+\x47\x65\x6e\x65\x72\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\
+\x20\x49\x6c\x6c\x75\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x39\x2e\
+\x30\x2e\x30\x2c\x20\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\
+\x50\x6c\x75\x67\x2d\x49\x6e\x20\x2e\x20\x53\x56\x47\x20\x56\x65\
+\x72\x73\x69\x6f\x6e\x3a\x20\x36\x2e\x30\x30\x20\x42\x75\x69\x6c\
+\x64\x20\x30\x29\x20\x20\x2d\x2d\x3e\x0a\x3c\x73\x76\x67\x20\x76\
+\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\x3d\
+\x22\x4c\x61\x79\x65\x72\x5f\x31\x22\x20\x78\x6d\x6c\x6e\x73\x3d\
+\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\
+\x72\x67\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\
+\x6e\x73\x3a\x78\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\
+\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\
+\x2f\x78\x6c\x69\x6e\x6b\x22\x20\x78\x3d\x22\x30\x70\x78\x22\x20\
+\x79\x3d\x22\x30\x70\x78\x22\x0a\x09\x20\x76\x69\x65\x77\x42\x6f\
+\x78\x3d\x22\x30\x20\x30\x20\x34\x32\x33\x2e\x37\x35\x34\x20\x34\
+\x32\x33\x2e\x37\x35\x34\x22\x20\x73\x74\x79\x6c\x65\x3d\x22\x65\
+\x6e\x61\x62\x6c\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\
+\x3a\x6e\x65\x77\x20\x30\x20\x30\x20\x34\x32\x33\x2e\x37\x35\x34\
+\x20\x34\x32\x33\x2e\x37\x35\x34\x3b\x22\x20\x78\x6d\x6c\x3a\x73\
+\x70\x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\x72\x76\x65\x22\x3e\
+\x0a\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x33\x35\x34\x2e\x32\
+\x34\x2c\x34\x37\x2e\x34\x6c\x33\x39\x2e\x38\x37\x39\x2d\x33\x39\
+\x2e\x38\x37\x39\x48\x32\x37\x32\x2e\x31\x39\x36\x76\x31\x32\x31\
+\x2e\x39\x32\x34\x6c\x36\x30\x2e\x38\x30\x31\x2d\x36\x30\x2e\x38\
+\x30\x31\x63\x35\x36\x2c\x35\x30\x2e\x30\x36\x36\x2c\x37\x37\x2e\
+\x32\x35\x31\x2c\x31\x33\x32\x2e\x30\x30\x34\x2c\x34\x36\x2e\x39\
+\x31\x38\x2c\x32\x30\x35\x2e\x32\x33\x35\x0a\x09\x63\x2d\x31\x38\
+\x2e\x35\x38\x35\x2c\x34\x34\x2e\x38\x36\x39\x2d\x35\x33\x2e\x35\
+\x33\x31\x2c\x37\x39\x2e\x38\x31\x35\x2d\x39\x38\x2e\x34\x2c\x39\
+\x38\x2e\x34\x63\x2d\x34\x34\x2e\x38\x36\x36\x2c\x31\x38\x2e\x35\
+\x38\x35\x2d\x39\x34\x2e\x32\x38\x38\x2c\x31\x38\x2e\x35\x38\x35\
+\x2d\x31\x33\x39\x2e\x31\x35\x38\x2c\x30\x63\x2d\x34\x34\x2e\x38\
+\x36\x39\x2d\x31\x38\x2e\x35\x38\x35\x2d\x37\x39\x2e\x38\x31\x35\
+\x2d\x35\x33\x2e\x35\x33\x31\x2d\x39\x38\x2e\x34\x2d\x39\x38\x2e\
+\x34\x0a\x09\x63\x2d\x31\x38\x2e\x35\x38\x35\x2d\x34\x34\x2e\x38\
+\x36\x39\x2d\x31\x38\x2e\x35\x38\x35\x2d\x39\x34\x2e\x32\x39\x2c\
+\x30\x2d\x31\x33\x39\x2e\x31\x35\x39\x6c\x2d\x32\x37\x2e\x37\x31\
+\x37\x2d\x31\x31\x2e\x34\x38\x63\x2d\x32\x31\x2e\x36\x35\x31\x2c\
+\x35\x32\x2e\x32\x37\x32\x2d\x32\x31\x2e\x36\x35\x31\x2c\x31\x30\
+\x39\x2e\x38\x34\x38\x2c\x30\x2c\x31\x36\x32\x2e\x31\x32\x0a\x09\
+\x63\x32\x31\x2e\x36\x35\x32\x2c\x35\x32\x2e\x32\x37\x32\x2c\x36\
+\x32\x2e\x33\x36\x34\x2c\x39\x32\x2e\x39\x38\x34\x2c\x31\x31\x34\
+\x2e\x36\x33\x37\x2c\x31\x31\x34\x2e\x36\x33\x36\x63\x32\x36\x2e\
+\x31\x34\x2c\x31\x30\x2e\x38\x32\x37\x2c\x35\x33\x2e\x35\x39\x35\
+\x2c\x31\x36\x2e\x32\x34\x2c\x38\x31\x2e\x30\x36\x2c\x31\x36\x2e\
+\x32\x33\x39\x63\x32\x37\x2e\x34\x35\x39\x2d\x30\x2e\x30\x30\x31\
+\x2c\x35\x34\x2e\x39\x32\x37\x2d\x35\x2e\x34\x31\x34\x2c\x38\x31\
+\x2e\x30\x36\x31\x2d\x31\x36\x2e\x32\x33\x39\x0a\x09\x63\x35\x32\
+\x2e\x32\x37\x31\x2d\x32\x31\x2e\x36\x35\x32\x2c\x39\x32\x2e\x39\
+\x38\x33\x2d\x36\x32\x2e\x33\x36\x34\x2c\x31\x31\x34\x2e\x36\x33\
+\x36\x2d\x31\x31\x34\x2e\x36\x33\x36\x43\x34\x34\x32\x2e\x37\x33\
+\x39\x2c\x32\x30\x30\x2e\x36\x2c\x34\x31\x38\x2e\x35\x33\x32\x2c\
+\x31\x30\x35\x2e\x38\x32\x36\x2c\x33\x35\x34\x2e\x32\x34\x2c\x34\
+\x37\x2e\x34\x7a\x22\x2f\x3e\x0a\x3c\x67\x3e\x0a\x3c\x2f\x67\x3e\
+\x0a\x3c\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\x3e\x0a\x3c\x2f\
+\x67\x3e\x0a\x3c\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\x3e\x0a\
+\x3c\x2f\x67\x3e\x0a\x3c\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\
+\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\
+\x3c\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\x3e\x0a\x3c\x2f\x67\
+\x3e\x0a\x3c\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\x3e\x0a\x3c\
+\x2f\x67\x3e\x0a\x3c\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\x3e\
+\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\
+\x2f\x73\x76\x67\x3e\x0a\
+\x00\x00\x03\x2a\
\x3c\
\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
@@ -1994,31 +2114,70 @@ qt_resource_data = b"\
\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3d\x22\x6e\x65\
\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x78\
\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\x72\
-\x76\x65\x22\x3e\x0a\x3c\x67\x3e\x0a\x09\x0a\x09\x09\x3c\x72\x65\
-\x63\x74\x20\x78\x3d\x22\x31\x37\x38\x2e\x38\x34\x36\x22\x20\x79\
-\x3d\x22\x39\x32\x2e\x30\x38\x37\x22\x20\x74\x72\x61\x6e\x73\x66\
-\x6f\x72\x6d\x3d\x22\x6d\x61\x74\x72\x69\x78\x28\x2d\x30\x2e\x37\
-\x30\x37\x31\x20\x2d\x30\x2e\x37\x30\x37\x31\x20\x30\x2e\x37\x30\
-\x37\x31\x20\x2d\x30\x2e\x37\x30\x37\x31\x20\x32\x32\x34\x2e\x33\
-\x34\x37\x36\x20\x36\x33\x31\x2e\x31\x34\x39\x38\x29\x22\x20\x77\
-\x69\x64\x74\x68\x3d\x22\x31\x32\x38\x2e\x30\x38\x35\x22\x20\x68\
-\x65\x69\x67\x68\x74\x3d\x22\x33\x35\x34\x2e\x30\x34\x39\x22\x2f\
-\x3e\x0a\x09\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x34\x37\x31\
-\x2e\x37\x32\x33\x2c\x38\x38\x2e\x33\x39\x33\x6c\x2d\x34\x38\x2e\
-\x31\x31\x35\x2d\x34\x38\x2e\x31\x31\x34\x63\x2d\x31\x31\x2e\x37\
-\x32\x33\x2d\x31\x31\x2e\x37\x32\x34\x2d\x33\x31\x2e\x35\x35\x38\
-\x2d\x31\x30\x2e\x38\x39\x36\x2d\x34\x34\x2e\x33\x30\x34\x2c\x31\
-\x2e\x38\x35\x6c\x2d\x34\x35\x2e\x32\x30\x32\x2c\x34\x35\x2e\x32\
-\x30\x33\x6c\x39\x30\x2e\x35\x36\x39\x2c\x39\x30\x2e\x35\x36\x38\
-\x6c\x34\x35\x2e\x32\x30\x32\x2d\x34\x35\x2e\x32\x30\x32\x0a\x09\
-\x09\x43\x34\x38\x32\x2e\x36\x31\x36\x2c\x31\x31\x39\x2e\x39\x35\
-\x32\x2c\x34\x38\x33\x2e\x34\x34\x35\x2c\x31\x30\x30\x2e\x31\x31\
-\x36\x2c\x34\x37\x31\x2e\x37\x32\x33\x2c\x38\x38\x2e\x33\x39\x33\
-\x7a\x22\x2f\x3e\x0a\x09\x3c\x70\x6f\x6c\x79\x67\x6f\x6e\x20\x70\
-\x6f\x69\x6e\x74\x73\x3d\x22\x36\x34\x2e\x30\x32\x31\x2c\x33\x36\
-\x33\x2e\x32\x35\x32\x20\x33\x32\x2c\x34\x38\x30\x20\x31\x34\x38\
-\x2e\x37\x33\x37\x2c\x34\x34\x37\x2e\x39\x37\x39\x20\x09\x22\x2f\
-\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\
+\x76\x65\x22\x3e\x0a\x3c\x67\x3e\x0a\x09\x3c\x70\x6f\x6c\x79\x67\
+\x6f\x6e\x20\x70\x6f\x69\x6e\x74\x73\x3d\x22\x33\x39\x36\x2e\x37\
+\x39\x35\x2c\x33\x39\x36\x2e\x38\x20\x33\x32\x30\x2c\x33\x39\x36\
+\x2e\x38\x20\x33\x32\x30\x2c\x34\x34\x38\x20\x34\x34\x38\x2c\x34\
+\x34\x38\x20\x34\x34\x38\x2c\x33\x32\x30\x20\x33\x39\x36\x2e\x37\
+\x39\x35\x2c\x33\x32\x30\x20\x09\x22\x2f\x3e\x0a\x09\x3c\x70\x6f\
+\x6c\x79\x67\x6f\x6e\x20\x70\x6f\x69\x6e\x74\x73\x3d\x22\x33\x39\
+\x36\x2e\x38\x2c\x31\x31\x35\x2e\x32\x30\x35\x20\x33\x39\x36\x2e\
+\x38\x2c\x31\x39\x32\x20\x34\x34\x38\x2c\x31\x39\x32\x20\x34\x34\
+\x38\x2c\x36\x34\x20\x33\x32\x30\x2c\x36\x34\x20\x33\x32\x30\x2c\
+\x31\x31\x35\x2e\x32\x30\x35\x20\x09\x22\x2f\x3e\x0a\x09\x3c\x70\
+\x6f\x6c\x79\x67\x6f\x6e\x20\x70\x6f\x69\x6e\x74\x73\x3d\x22\x31\
+\x31\x35\x2e\x32\x30\x35\x2c\x31\x31\x35\x2e\x32\x20\x31\x39\x32\
+\x2c\x31\x31\x35\x2e\x32\x20\x31\x39\x32\x2c\x36\x34\x20\x36\x34\
+\x2c\x36\x34\x20\x36\x34\x2c\x31\x39\x32\x20\x31\x31\x35\x2e\x32\
+\x30\x35\x2c\x31\x39\x32\x20\x09\x22\x2f\x3e\x0a\x09\x3c\x70\x6f\
+\x6c\x79\x67\x6f\x6e\x20\x70\x6f\x69\x6e\x74\x73\x3d\x22\x31\x31\
+\x35\x2e\x32\x2c\x33\x39\x36\x2e\x37\x39\x35\x20\x31\x31\x35\x2e\
+\x32\x2c\x33\x32\x30\x20\x36\x34\x2c\x33\x32\x30\x20\x36\x34\x2c\
+\x34\x34\x38\x20\x31\x39\x32\x2c\x34\x34\x38\x20\x31\x39\x32\x2c\
+\x33\x39\x36\x2e\x37\x39\x35\x20\x09\x22\x2f\x3e\x0a\x3c\x2f\x67\
+\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\
+\x00\x00\x02\x77\
+\x3c\
+\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
+\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
+\x2d\x38\x22\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\x72\
+\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\x20\x49\x6c\x6c\x75\
+\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x36\x2e\x32\x2e\x31\x2c\x20\
+\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\x50\x6c\x75\x67\x2d\
+\x49\x6e\x20\x2e\x20\x53\x56\x47\x20\x56\x65\x72\x73\x69\x6f\x6e\
+\x3a\x20\x36\x2e\x30\x30\x20\x42\x75\x69\x6c\x64\x20\x30\x29\x20\
+\x20\x2d\x2d\x3e\x0a\x3c\x21\x44\x4f\x43\x54\x59\x50\x45\x20\x73\
+\x76\x67\x20\x50\x55\x42\x4c\x49\x43\x20\x22\x2d\x2f\x2f\x57\x33\
+\x43\x2f\x2f\x44\x54\x44\x20\x53\x56\x47\x20\x31\x2e\x31\x2f\x2f\
+\x45\x4e\x22\x20\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\
+\x77\x33\x2e\x6f\x72\x67\x2f\x47\x72\x61\x70\x68\x69\x63\x73\x2f\
+\x53\x56\x47\x2f\x31\x2e\x31\x2f\x44\x54\x44\x2f\x73\x76\x67\x31\
+\x31\x2e\x64\x74\x64\x22\x3e\x0a\x3c\x73\x76\x67\x20\x76\x65\x72\
+\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\x3d\x22\x4c\
+\x61\x79\x65\x72\x5f\x31\x22\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\
+\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\
+\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\x6e\x73\
+\x3a\x78\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\
+\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\x78\
+\x6c\x69\x6e\x6b\x22\x20\x78\x3d\x22\x30\x70\x78\x22\x20\x79\x3d\
+\x22\x30\x70\x78\x22\x0a\x09\x20\x77\x69\x64\x74\x68\x3d\x22\x35\
+\x31\x32\x70\x78\x22\x20\x68\x65\x69\x67\x68\x74\x3d\x22\x35\x31\
+\x32\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\x20\
+\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x73\x74\x79\x6c\x65\
+\x3d\x22\x65\x6e\x61\x62\x6c\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\
+\x75\x6e\x64\x3a\x6e\x65\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\
+\x35\x31\x32\x3b\x22\x20\x78\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\
+\x22\x70\x72\x65\x73\x65\x72\x76\x65\x22\x3e\x0a\x3c\x70\x6f\x6c\
+\x79\x67\x6f\x6e\x20\x70\x6f\x69\x6e\x74\x73\x3d\x22\x32\x38\x38\
+\x2c\x39\x36\x20\x33\x33\x37\x2e\x39\x2c\x31\x34\x35\x2e\x39\x20\
+\x32\x37\x34\x2c\x32\x30\x39\x2e\x37\x20\x32\x37\x34\x2c\x32\x30\
+\x39\x2e\x37\x20\x31\x34\x35\x2e\x39\x2c\x33\x33\x37\x2e\x39\x20\
+\x39\x36\x2c\x32\x38\x38\x20\x39\x36\x2c\x34\x31\x36\x20\x32\x32\
+\x34\x2c\x34\x31\x36\x20\x31\x37\x34\x2e\x31\x2c\x33\x36\x36\x2e\
+\x31\x20\x33\x35\x37\x2e\x34\x2c\x31\x38\x32\x2e\x39\x20\x33\x36\
+\x36\x2e\x31\x2c\x31\x37\x34\x2e\x31\x20\x0a\x09\x34\x31\x36\x2c\
+\x32\x32\x34\x20\x34\x31\x36\x2c\x39\x36\x20\x22\x2f\x3e\x0a\x3c\
+\x2f\x73\x76\x67\x3e\x0a\
\x00\x00\x03\x48\
\x3c\
\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
@@ -2074,13 +2233,13 @@ qt_resource_data = b"\
\x38\x38\x35\x2c\x31\x30\x2e\x36\x36\x36\x2c\x31\x30\x2e\x36\x36\
\x37\x0a\x09\x56\x33\x37\x33\x2e\x33\x33\x33\x7a\x22\x2f\x3e\x0a\
\x3c\x2f\x73\x76\x67\x3e\x0a\
-\x00\x00\x02\x6c\
+\x00\x00\x03\x03\
\x3c\
\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
\x2d\x38\x22\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\x72\
\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\x20\x49\x6c\x6c\x75\
-\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x36\x2e\x32\x2e\x31\x2c\x20\
+\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x38\x2e\x31\x2e\x30\x2c\x20\
\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\x50\x6c\x75\x67\x2d\
\x49\x6e\x20\x2e\x20\x53\x56\x47\x20\x56\x65\x72\x73\x69\x6f\x6e\
\x3a\x20\x36\x2e\x30\x30\x20\x42\x75\x69\x6c\x64\x20\x30\x29\x20\
@@ -2091,37 +2250,47 @@ qt_resource_data = b"\
\x77\x33\x2e\x6f\x72\x67\x2f\x47\x72\x61\x70\x68\x69\x63\x73\x2f\
\x53\x56\x47\x2f\x31\x2e\x31\x2f\x44\x54\x44\x2f\x73\x76\x67\x31\
\x31\x2e\x64\x74\x64\x22\x3e\x0a\x3c\x73\x76\x67\x20\x76\x65\x72\
-\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\x3d\x22\x4c\
-\x61\x79\x65\x72\x5f\x31\x22\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\
-\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\
-\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\x6e\x73\
-\x3a\x78\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\
-\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\x78\
-\x6c\x69\x6e\x6b\x22\x20\x78\x3d\x22\x30\x70\x78\x22\x20\x79\x3d\
-\x22\x30\x70\x78\x22\x0a\x09\x20\x77\x69\x64\x74\x68\x3d\x22\x35\
-\x31\x32\x70\x78\x22\x20\x68\x65\x69\x67\x68\x74\x3d\x22\x35\x31\
-\x32\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\x20\
-\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x65\x6e\x61\x62\x6c\
-\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3d\x22\x6e\x65\
-\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x78\
-\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\x72\
-\x76\x65\x22\x3e\x0a\x3c\x67\x20\x69\x64\x3d\x22\x49\x63\x6f\x6e\
-\x5f\x31\x5f\x22\x3e\x0a\x09\x3c\x67\x3e\x0a\x09\x09\x3c\x67\x3e\
-\x0a\x09\x09\x09\x3c\x70\x6f\x6c\x79\x67\x6f\x6e\x20\x70\x6f\x69\
-\x6e\x74\x73\x3d\x22\x31\x38\x36\x2e\x33\x30\x31\x2c\x33\x33\x39\
-\x2e\x38\x39\x33\x20\x39\x36\x2c\x32\x34\x39\x2e\x34\x36\x31\x20\
-\x36\x34\x2c\x32\x37\x39\x2e\x39\x36\x38\x20\x31\x38\x36\x2e\x33\
-\x30\x31\x2c\x34\x30\x32\x20\x34\x34\x38\x2c\x31\x34\x30\x2e\x35\
-\x30\x36\x20\x34\x31\x36\x2c\x31\x31\x30\x20\x09\x09\x09\x22\x2f\
-\x3e\x0a\x09\x09\x3c\x2f\x67\x3e\x0a\x09\x3c\x2f\x67\x3e\x0a\x3c\
-\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\
-\x00\x00\x03\xe8\
+\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\x3d\x22\x43\
+\x68\x65\x63\x6b\x22\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\x74\x74\
+\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x32\
+\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\x6e\x73\x3a\x78\
+\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\
+\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\x78\x6c\x69\
+\x6e\x6b\x22\x20\x78\x3d\x22\x30\x70\x78\x22\x20\x79\x3d\x22\x30\
+\x70\x78\x22\x0a\x09\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\
+\x20\x30\x20\x32\x30\x20\x32\x30\x22\x20\x65\x6e\x61\x62\x6c\x65\
+\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3d\x22\x6e\x65\x77\
+\x20\x30\x20\x30\x20\x32\x30\x20\x32\x30\x22\x20\x78\x6d\x6c\x3a\
+\x73\x70\x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\x72\x76\x65\x22\
+\x3e\x0a\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x38\x2e\x32\x39\
+\x34\x2c\x31\x36\x2e\x39\x39\x38\x63\x2d\x30\x2e\x34\x33\x35\x2c\
+\x30\x2d\x30\x2e\x38\x34\x37\x2d\x30\x2e\x32\x30\x33\x2d\x31\x2e\
+\x31\x31\x31\x2d\x30\x2e\x35\x35\x33\x4c\x33\x2e\x36\x31\x2c\x31\
+\x31\x2e\x37\x32\x34\x63\x2d\x30\x2e\x34\x36\x35\x2d\x30\x2e\x36\
+\x31\x33\x2d\x30\x2e\x33\x34\x34\x2d\x31\x2e\x34\x38\x36\x2c\x30\
+\x2e\x32\x37\x2d\x31\x2e\x39\x35\x31\x0a\x09\x63\x30\x2e\x36\x31\
+\x35\x2d\x30\x2e\x34\x36\x37\x2c\x31\x2e\x34\x38\x38\x2d\x30\x2e\
+\x33\x34\x34\x2c\x31\x2e\x39\x35\x33\x2c\x30\x2e\x32\x37\x6c\x32\
+\x2e\x33\x35\x31\x2c\x33\x2e\x31\x30\x34\x6c\x35\x2e\x39\x31\x31\
+\x2d\x39\x2e\x34\x39\x32\x63\x30\x2e\x34\x30\x37\x2d\x30\x2e\x36\
+\x35\x32\x2c\x31\x2e\x32\x36\x37\x2d\x30\x2e\x38\x35\x32\x2c\x31\
+\x2e\x39\x32\x31\x2d\x30\x2e\x34\x34\x35\x0a\x09\x63\x30\x2e\x36\
+\x35\x33\x2c\x30\x2e\x34\x30\x36\x2c\x30\x2e\x38\x35\x34\x2c\x31\
+\x2e\x32\x36\x36\x2c\x30\x2e\x34\x34\x36\x2c\x31\x2e\x39\x32\x4c\
+\x39\x2e\x34\x37\x38\x2c\x31\x36\x2e\x33\x34\x63\x2d\x30\x2e\x32\
+\x34\x32\x2c\x30\x2e\x33\x39\x31\x2d\x30\x2e\x36\x36\x31\x2c\x30\
+\x2e\x36\x33\x35\x2d\x31\x2e\x31\x32\x2c\x30\x2e\x36\x35\x36\x43\
+\x38\x2e\x33\x33\x36\x2c\x31\x36\x2e\x39\x39\x38\x2c\x38\x2e\x33\
+\x31\x36\x2c\x31\x36\x2e\x39\x39\x38\x2c\x38\x2e\x32\x39\x34\x2c\
+\x31\x36\x2e\x39\x39\x38\x7a\x22\x2f\x3e\x0a\x3c\x2f\x73\x76\x67\
+\x3e\x0a\
+\x00\x00\x03\x3d\
\x3c\
\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
\x2d\x38\x22\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\x72\
\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\x20\x49\x6c\x6c\x75\
-\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x38\x2e\x31\x2e\x31\x2c\x20\
+\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x36\x2e\x32\x2e\x31\x2c\x20\
\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\x50\x6c\x75\x67\x2d\
\x49\x6e\x20\x2e\x20\x53\x56\x47\x20\x56\x65\x72\x73\x69\x6f\x6e\
\x3a\x20\x36\x2e\x30\x30\x20\x42\x75\x69\x6c\x64\x20\x30\x29\x20\
@@ -2132,61 +2301,50 @@ qt_resource_data = b"\
\x77\x33\x2e\x6f\x72\x67\x2f\x47\x72\x61\x70\x68\x69\x63\x73\x2f\
\x53\x56\x47\x2f\x31\x2e\x31\x2f\x44\x54\x44\x2f\x73\x76\x67\x31\
\x31\x2e\x64\x74\x64\x22\x3e\x0a\x3c\x73\x76\x67\x20\x76\x65\x72\
-\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\x3d\x22\x43\
-\x68\x65\x76\x72\x6f\x6e\x5f\x63\x69\x72\x63\x6c\x65\x64\x5f\x6c\
-\x65\x66\x74\x22\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\x74\x74\x70\
-\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x32\x30\
-\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\x6e\x73\x3a\x78\x6c\
-\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\
-\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\x78\x6c\x69\x6e\
-\x6b\x22\x0a\x09\x20\x78\x3d\x22\x30\x70\x78\x22\x20\x79\x3d\x22\
-\x30\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\x20\
-\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x65\x6e\x61\x62\x6c\
-\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3d\x22\x6e\x65\
-\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x78\
-\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\x72\
-\x76\x65\x22\x3e\x0a\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\
-\x6d\x3d\x27\x6d\x61\x74\x72\x69\x78\x28\x32\x34\x20\x30\x20\x30\
-\x20\x32\x34\x20\x30\x20\x30\x29\x27\x3e\x0a\x3c\x70\x61\x74\x68\
-\x20\x64\x3d\x22\x4d\x31\x31\x2e\x33\x30\x32\x2c\x36\x2e\x37\x37\
-\x36\x63\x2d\x30\x2e\x31\x39\x36\x2d\x30\x2e\x31\x39\x37\x2d\x30\
-\x2e\x35\x31\x35\x2d\x30\x2e\x31\x39\x37\x2d\x30\x2e\x37\x31\x2c\
-\x30\x4c\x37\x2e\x37\x38\x35\x2c\x39\x2e\x36\x34\x31\x63\x2d\x30\
-\x2e\x31\x39\x36\x2c\x30\x2e\x31\x39\x39\x2d\x30\x2e\x31\x39\x36\
-\x2c\x30\x2e\x35\x32\x2c\x30\x2c\x30\x2e\x37\x31\x37\x6c\x32\x2e\
-\x38\x30\x37\x2c\x32\x2e\x38\x36\x34\x0a\x09\x63\x30\x2e\x31\x39\
-\x35\x2c\x30\x2e\x31\x39\x39\x2c\x30\x2e\x35\x31\x34\x2c\x30\x2e\
-\x31\x39\x38\x2c\x30\x2e\x37\x31\x2c\x30\x63\x30\x2e\x31\x39\x36\
-\x2d\x30\x2e\x31\x39\x37\x2c\x30\x2e\x31\x39\x36\x2d\x30\x2e\x35\
-\x31\x38\x2c\x30\x2d\x30\x2e\x37\x31\x37\x4c\x39\x2c\x31\x30\x6c\
-\x32\x2e\x33\x30\x32\x2d\x32\x2e\x35\x30\x36\x43\x31\x31\x2e\x34\
-\x39\x38\x2c\x37\x2e\x32\x39\x36\x2c\x31\x31\x2e\x34\x39\x38\x2c\
-\x36\x2e\x39\x37\x36\x2c\x31\x31\x2e\x33\x30\x32\x2c\x36\x2e\x37\
-\x37\x36\x7a\x0a\x09\x20\x4d\x31\x30\x2c\x30\x2e\x34\x63\x2d\x35\
-\x2e\x33\x30\x32\x2c\x30\x2d\x39\x2e\x36\x2c\x34\x2e\x32\x39\x38\
-\x2d\x39\x2e\x36\x2c\x39\x2e\x36\x63\x30\x2c\x35\x2e\x33\x30\x33\
-\x2c\x34\x2e\x32\x39\x38\x2c\x39\x2e\x36\x2c\x39\x2e\x36\x2c\x39\
-\x2e\x36\x73\x39\x2e\x36\x2d\x34\x2e\x32\x39\x37\x2c\x39\x2e\x36\
-\x2d\x39\x2e\x36\x43\x31\x39\x2e\x36\x2c\x34\x2e\x36\x39\x38\x2c\
-\x31\x35\x2e\x33\x30\x32\x2c\x30\x2e\x34\x2c\x31\x30\x2c\x30\x2e\
-\x34\x7a\x20\x4d\x31\x30\x2c\x31\x38\x2e\x33\x35\x34\x0a\x09\x63\
-\x2d\x34\x2e\x36\x31\x35\x2c\x30\x2d\x38\x2e\x33\x35\x34\x2d\x33\
-\x2e\x37\x34\x2d\x38\x2e\x33\x35\x34\x2d\x38\x2e\x33\x35\x34\x63\
-\x30\x2d\x34\x2e\x36\x31\x34\x2c\x33\x2e\x37\x33\x39\x2d\x38\x2e\
-\x33\x35\x34\x2c\x38\x2e\x33\x35\x34\x2d\x38\x2e\x33\x35\x34\x63\
-\x34\x2e\x36\x31\x33\x2c\x30\x2c\x38\x2e\x33\x35\x34\x2c\x33\x2e\
-\x37\x34\x2c\x38\x2e\x33\x35\x34\x2c\x38\x2e\x33\x35\x34\x0a\x09\
-\x43\x31\x38\x2e\x33\x35\x34\x2c\x31\x34\x2e\x36\x31\x34\x2c\x31\
-\x34\x2e\x36\x31\x33\x2c\x31\x38\x2e\x33\x35\x34\x2c\x31\x30\x2c\
-\x31\x38\x2e\x33\x35\x34\x7a\x22\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\
-\x3c\x2f\x73\x76\x67\x3e\x0a\
-\x00\x00\x03\xda\
+\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\x3d\x22\x4c\
+\x61\x79\x65\x72\x5f\x31\x22\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\
+\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\
+\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\x6e\x73\
+\x3a\x78\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\
+\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\x78\
+\x6c\x69\x6e\x6b\x22\x20\x78\x3d\x22\x30\x70\x78\x22\x20\x79\x3d\
+\x22\x30\x70\x78\x22\x0a\x09\x20\x77\x69\x64\x74\x68\x3d\x22\x35\
+\x31\x32\x70\x78\x22\x20\x68\x65\x69\x67\x68\x74\x3d\x22\x35\x31\
+\x32\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\x20\
+\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x73\x74\x79\x6c\x65\
+\x3d\x22\x65\x6e\x61\x62\x6c\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\
+\x75\x6e\x64\x3a\x6e\x65\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\
+\x35\x31\x32\x3b\x22\x20\x78\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\
+\x22\x70\x72\x65\x73\x65\x72\x76\x65\x22\x3e\x0a\x3c\x70\x61\x74\
+\x68\x20\x64\x3d\x22\x4d\x34\x33\x37\x2e\x35\x2c\x33\x38\x36\x2e\
+\x36\x4c\x33\x30\x36\x2e\x39\x2c\x32\x35\x36\x6c\x31\x33\x30\x2e\
+\x36\x2d\x31\x33\x30\x2e\x36\x63\x31\x34\x2e\x31\x2d\x31\x34\x2e\
+\x31\x2c\x31\x34\x2e\x31\x2d\x33\x36\x2e\x38\x2c\x30\x2d\x35\x30\
+\x2e\x39\x63\x2d\x31\x34\x2e\x31\x2d\x31\x34\x2e\x31\x2d\x33\x36\
+\x2e\x38\x2d\x31\x34\x2e\x31\x2d\x35\x30\x2e\x39\x2c\x30\x4c\x32\
+\x35\x36\x2c\x32\x30\x35\x2e\x31\x4c\x31\x32\x35\x2e\x34\x2c\x37\
+\x34\x2e\x35\x0a\x09\x63\x2d\x31\x34\x2e\x31\x2d\x31\x34\x2e\x31\
+\x2d\x33\x36\x2e\x38\x2d\x31\x34\x2e\x31\x2d\x35\x30\x2e\x39\x2c\
+\x30\x63\x2d\x31\x34\x2e\x31\x2c\x31\x34\x2e\x31\x2d\x31\x34\x2e\
+\x31\x2c\x33\x36\x2e\x38\x2c\x30\x2c\x35\x30\x2e\x39\x4c\x32\x30\
+\x35\x2e\x31\x2c\x32\x35\x36\x4c\x37\x34\x2e\x35\x2c\x33\x38\x36\
+\x2e\x36\x63\x2d\x31\x34\x2e\x31\x2c\x31\x34\x2e\x31\x2d\x31\x34\
+\x2e\x31\x2c\x33\x36\x2e\x38\x2c\x30\x2c\x35\x30\x2e\x39\x0a\x09\
+\x63\x31\x34\x2e\x31\x2c\x31\x34\x2e\x31\x2c\x33\x36\x2e\x38\x2c\
+\x31\x34\x2e\x31\x2c\x35\x30\x2e\x39\x2c\x30\x4c\x32\x35\x36\x2c\
+\x33\x30\x36\x2e\x39\x6c\x31\x33\x30\x2e\x36\x2c\x31\x33\x30\x2e\
+\x36\x63\x31\x34\x2e\x31\x2c\x31\x34\x2e\x31\x2c\x33\x36\x2e\x38\
+\x2c\x31\x34\x2e\x31\x2c\x35\x30\x2e\x39\x2c\x30\x43\x34\x35\x31\
+\x2e\x35\x2c\x34\x32\x33\x2e\x34\x2c\x34\x35\x31\x2e\x35\x2c\x34\
+\x30\x30\x2e\x36\x2c\x34\x33\x37\x2e\x35\x2c\x33\x38\x36\x2e\x36\
+\x7a\x22\x2f\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\
+\x00\x00\x04\x54\
\x3c\
\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
\x2d\x38\x22\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\x72\
\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\x20\x49\x6c\x6c\x75\
-\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x36\x2e\x30\x2e\x30\x2c\x20\
+\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x36\x2e\x32\x2e\x31\x2c\x20\
\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\x50\x6c\x75\x67\x2d\
\x49\x6e\x20\x2e\x20\x53\x56\x47\x20\x56\x65\x72\x73\x69\x6f\x6e\
\x3a\x20\x36\x2e\x30\x30\x20\x42\x75\x69\x6c\x64\x20\x30\x29\x20\
@@ -2211,120 +2369,54 @@ qt_resource_data = b"\
\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3d\x22\x6e\x65\
\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x78\
\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\x72\
-\x76\x65\x22\x3e\x0a\x3c\x67\x3e\x0a\x09\x3c\x70\x61\x74\x68\x20\
-\x64\x3d\x22\x4d\x34\x38\x2e\x34\x35\x31\x2c\x34\x36\x34\x2e\x38\
-\x32\x38\x63\x34\x30\x2e\x30\x32\x33\x2d\x30\x2e\x33\x31\x35\x2c\
-\x34\x35\x2e\x30\x31\x2d\x39\x2e\x39\x35\x35\x2c\x35\x38\x2e\x30\
-\x35\x32\x2d\x35\x30\x2e\x31\x33\x32\x63\x32\x34\x2e\x30\x35\x37\
-\x2d\x36\x33\x2e\x34\x30\x38\x2c\x31\x33\x32\x2e\x34\x31\x39\x2c\
-\x31\x36\x2e\x35\x39\x31\x2c\x36\x35\x2e\x32\x36\x39\x2c\x34\x34\
-\x2e\x33\x37\x34\x0a\x09\x09\x43\x31\x30\x34\x2e\x36\x32\x32\x2c\
-\x34\x38\x36\x2e\x38\x35\x32\x2c\x38\x2e\x34\x32\x38\x2c\x34\x36\
-\x35\x2e\x31\x34\x33\x2c\x34\x38\x2e\x34\x35\x31\x2c\x34\x36\x34\
-\x2e\x38\x32\x38\x7a\x22\x2f\x3e\x0a\x09\x3c\x70\x61\x74\x68\x20\
-\x64\x3d\x22\x4d\x34\x35\x38\x2e\x38\x35\x37\x2c\x34\x36\x2e\x39\
-\x30\x32\x63\x2d\x31\x39\x2e\x34\x31\x37\x2d\x31\x35\x2e\x36\x34\
-\x37\x2d\x35\x31\x2e\x35\x39\x32\x2d\x37\x2e\x39\x33\x38\x2d\x37\
-\x31\x2e\x38\x36\x34\x2c\x31\x37\x2e\x32\x31\x39\x4c\x31\x38\x31\
-\x2e\x36\x34\x35\x2c\x33\x35\x35\x2e\x38\x34\x39\x63\x2d\x32\x30\
-\x2e\x32\x37\x32\x2c\x32\x35\x2e\x31\x35\x34\x2d\x32\x30\x2e\x31\
-\x37\x31\x2c\x32\x30\x2e\x33\x34\x37\x2d\x30\x2e\x37\x35\x34\x2c\
-\x33\x35\x2e\x39\x39\x32\x0a\x09\x09\x63\x31\x39\x2e\x34\x31\x37\
-\x2c\x31\x35\x2e\x36\x34\x38\x2c\x31\x34\x2e\x37\x33\x38\x2c\x31\
-\x36\x2e\x37\x37\x2c\x33\x35\x2e\x30\x31\x31\x2d\x38\x2e\x33\x38\
-\x38\x6c\x32\x34\x31\x2e\x34\x30\x36\x2d\x32\x36\x32\x2e\x36\x36\
-\x39\x43\x34\x37\x37\x2e\x35\x38\x31\x2c\x39\x35\x2e\x36\x32\x38\
-\x2c\x34\x37\x38\x2e\x32\x37\x35\x2c\x36\x32\x2e\x35\x35\x2c\x34\
-\x35\x38\x2e\x38\x35\x37\x2c\x34\x36\x2e\x39\x30\x32\x7a\x20\x4d\
-\x34\x30\x36\x2e\x30\x36\x35\x2c\x38\x31\x2e\x38\x32\x35\x0a\x09\
-\x09\x63\x30\x2c\x30\x2d\x33\x2d\x33\x2e\x35\x2d\x31\x33\x2d\x31\
-\x31\x2e\x35\x63\x31\x35\x2d\x32\x34\x2e\x35\x2c\x34\x34\x2e\x35\
-\x2d\x32\x30\x2c\x34\x34\x2e\x35\x2d\x32\x30\x43\x34\x30\x39\x2e\
-\x35\x36\x35\x2c\x36\x36\x2e\x38\x32\x35\x2c\x34\x30\x36\x2e\x30\
-\x36\x35\x2c\x38\x31\x2e\x38\x32\x35\x2c\x34\x30\x36\x2e\x30\x36\
-\x35\x2c\x38\x31\x2e\x38\x32\x35\x7a\x22\x2f\x3e\x0a\x3c\x2f\x67\
-\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\
-\x00\x00\x04\x73\
-\x3c\
-\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x27\x31\x2e\
-\x30\x27\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x27\x55\x54\x46\
-\x2d\x38\x27\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x54\x68\x69\x73\x20\
-\x66\x69\x6c\x65\x20\x77\x61\x73\x20\x67\x65\x6e\x65\x72\x61\x74\
-\x65\x64\x20\x62\x79\x20\x64\x76\x69\x73\x76\x67\x6d\x20\x32\x2e\
-\x31\x31\x2e\x31\x20\x2d\x2d\x3e\x0a\x3c\x73\x76\x67\x20\x76\x65\
-\x72\x73\x69\x6f\x6e\x3d\x27\x31\x2e\x31\x27\x20\x78\x6d\x6c\x6e\
-\x73\x3d\x27\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\
-\x2e\x6f\x72\x67\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x27\x20\x78\
-\x6d\x6c\x6e\x73\x3a\x78\x6c\x69\x6e\x6b\x3d\x27\x68\x74\x74\x70\
-\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\
-\x39\x39\x2f\x78\x6c\x69\x6e\x6b\x27\x20\x77\x69\x64\x74\x68\x3d\
-\x27\x36\x34\x2e\x30\x30\x30\x31\x70\x74\x27\x20\x68\x65\x69\x67\
-\x68\x74\x3d\x27\x36\x34\x70\x74\x27\x20\x76\x69\x65\x77\x42\x6f\
-\x78\x3d\x27\x35\x38\x2e\x34\x36\x36\x39\x20\x31\x31\x37\x2e\x38\
-\x35\x38\x20\x36\x34\x2e\x30\x30\x30\x31\x20\x36\x34\x27\x3e\x0a\
-\x3c\x67\x20\x69\x64\x3d\x27\x70\x61\x67\x65\x31\x27\x3e\x0a\x3c\
-\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x74\x72\x61\
-\x6e\x73\x6c\x61\x74\x65\x28\x35\x38\x2e\x34\x36\x36\x39\x20\x31\
-\x31\x37\x2e\x38\x35\x38\x29\x73\x63\x61\x6c\x65\x28\x2e\x39\x39\
-\x36\x32\x36\x34\x29\x27\x3e\x0a\x3c\x70\x61\x74\x68\x20\x64\x3d\
-\x27\x4d\x20\x36\x2e\x30\x32\x32\x35\x20\x33\x32\x2e\x31\x32\x43\
-\x20\x36\x2e\x32\x32\x30\x37\x32\x20\x32\x34\x2e\x39\x36\x35\x35\
-\x20\x39\x2e\x30\x34\x39\x38\x39\x20\x31\x38\x2e\x31\x33\x35\x33\
-\x20\x31\x33\x2e\x39\x36\x38\x37\x20\x31\x32\x2e\x39\x33\x36\x31\
-\x43\x20\x32\x39\x2e\x35\x30\x36\x32\x20\x2d\x33\x2e\x34\x38\x36\
-\x38\x36\x20\x35\x35\x2e\x33\x36\x37\x33\x20\x32\x2e\x36\x39\x39\
-\x35\x20\x35\x38\x2e\x32\x31\x37\x35\x20\x32\x31\x2e\x37\x33\x37\
-\x38\x43\x20\x35\x39\x2e\x36\x39\x32\x32\x20\x33\x31\x2e\x35\x38\
-\x38\x31\x20\x35\x32\x2e\x36\x35\x30\x38\x20\x34\x30\x2e\x36\x37\
-\x37\x39\x20\x34\x32\x2e\x37\x34\x34\x35\x20\x34\x31\x2e\x37\x31\
-\x31\x39\x27\x20\x66\x69\x6c\x6c\x3d\x27\x6e\x6f\x6e\x65\x27\x20\
-\x73\x74\x72\x6f\x6b\x65\x3d\x27\x23\x30\x30\x30\x30\x30\x30\x27\
-\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6c\x69\x6e\x65\x63\x61\x70\x3d\
-\x27\x72\x6f\x75\x6e\x64\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6c\
-\x69\x6e\x65\x6a\x6f\x69\x6e\x3d\x27\x72\x6f\x75\x6e\x64\x27\x20\
-\x73\x74\x72\x6f\x6b\x65\x2d\x6d\x69\x74\x65\x72\x6c\x69\x6d\x69\
-\x74\x3d\x27\x31\x30\x2e\x30\x33\x37\x35\x27\x20\x73\x74\x72\x6f\
-\x6b\x65\x2d\x77\x69\x64\x74\x68\x3d\x27\x32\x2e\x35\x30\x39\x33\
-\x37\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\x20\x74\x72\x61\
-\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x74\x72\x61\x6e\x73\x6c\x61\x74\
-\x65\x28\x35\x38\x2e\x34\x36\x36\x39\x20\x31\x31\x37\x2e\x38\x35\
-\x38\x29\x73\x63\x61\x6c\x65\x28\x2e\x39\x39\x36\x32\x36\x34\x29\
-\x27\x3e\x0a\x3c\x63\x69\x72\x63\x6c\x65\x20\x63\x78\x3d\x27\x36\
-\x2e\x30\x32\x32\x35\x27\x20\x63\x79\x3d\x27\x33\x32\x2e\x31\x32\
-\x27\x20\x66\x69\x6c\x6c\x3d\x27\x23\x66\x66\x30\x30\x30\x30\x27\
-\x20\x72\x3d\x27\x36\x2e\x30\x32\x32\x35\x27\x2f\x3e\x0a\x3c\x2f\
-\x67\x3e\x0a\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\
-\x27\x74\x72\x61\x6e\x73\x6c\x61\x74\x65\x28\x35\x38\x2e\x34\x36\
-\x36\x39\x20\x31\x31\x37\x2e\x38\x35\x38\x29\x73\x63\x61\x6c\x65\
-\x28\x2e\x39\x39\x36\x32\x36\x34\x29\x27\x3e\x0a\x3c\x63\x69\x72\
-\x63\x6c\x65\x20\x63\x78\x3d\x27\x31\x33\x2e\x39\x36\x38\x37\x27\
-\x20\x63\x79\x3d\x27\x31\x32\x2e\x39\x33\x36\x31\x27\x20\x66\x69\
-\x6c\x6c\x3d\x27\x23\x66\x66\x30\x30\x30\x30\x27\x20\x72\x3d\x27\
-\x36\x2e\x30\x32\x32\x35\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\
-\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x74\x72\x61\
-\x6e\x73\x6c\x61\x74\x65\x28\x35\x38\x2e\x34\x36\x36\x39\x20\x31\
-\x31\x37\x2e\x38\x35\x38\x29\x73\x63\x61\x6c\x65\x28\x2e\x39\x39\
-\x36\x32\x36\x34\x29\x27\x3e\x0a\x3c\x63\x69\x72\x63\x6c\x65\x20\
-\x63\x78\x3d\x27\x35\x38\x2e\x32\x31\x37\x35\x27\x20\x63\x79\x3d\
-\x27\x32\x31\x2e\x37\x33\x37\x38\x27\x20\x66\x69\x6c\x6c\x3d\x27\
-\x23\x66\x66\x30\x30\x30\x30\x27\x20\x72\x3d\x27\x36\x2e\x30\x32\
-\x32\x35\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x67\x20\x74\x72\
-\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x74\x72\x61\x6e\x73\x6c\x61\
-\x74\x65\x28\x35\x38\x2e\x34\x36\x36\x39\x20\x31\x31\x37\x2e\x38\
-\x35\x38\x29\x73\x63\x61\x6c\x65\x28\x2e\x39\x39\x36\x32\x36\x34\
-\x29\x27\x3e\x0a\x3c\x63\x69\x72\x63\x6c\x65\x20\x63\x78\x3d\x27\
-\x34\x32\x2e\x37\x34\x34\x35\x27\x20\x63\x79\x3d\x27\x34\x31\x2e\
-\x37\x31\x31\x39\x27\x20\x66\x69\x6c\x6c\x3d\x27\x23\x66\x66\x30\
-\x30\x30\x30\x27\x20\x72\x3d\x27\x36\x2e\x30\x32\x32\x35\x27\x2f\
-\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\
-\x67\x3e\
-\x00\x00\x04\xca\
+\x76\x65\x22\x3e\x0a\x3c\x67\x20\x69\x64\x3d\x22\x49\x63\x6f\x6e\
+\x22\x3e\x0a\x09\x3c\x67\x3e\x0a\x09\x09\x3c\x70\x61\x74\x68\x20\
+\x64\x3d\x22\x4d\x32\x35\x36\x2c\x31\x37\x36\x63\x2d\x34\x34\x2e\
+\x30\x30\x34\x2c\x30\x2d\x38\x30\x2e\x30\x30\x31\x2c\x33\x36\x2d\
+\x38\x30\x2e\x30\x30\x31\x2c\x38\x30\x63\x30\x2c\x34\x34\x2e\x30\
+\x30\x34\x2c\x33\x35\x2e\x39\x39\x37\x2c\x38\x30\x2c\x38\x30\x2e\
+\x30\x30\x31\x2c\x38\x30\x63\x34\x34\x2e\x30\x30\x35\x2c\x30\x2c\
+\x37\x39\x2e\x39\x39\x39\x2d\x33\x35\x2e\x39\x39\x36\x2c\x37\x39\
+\x2e\x39\x39\x39\x2d\x38\x30\x0a\x09\x09\x09\x43\x33\x33\x35\x2e\
+\x39\x39\x39\x2c\x32\x31\x32\x2c\x33\x30\x30\x2e\x30\x30\x35\x2c\
+\x31\x37\x36\x2c\x32\x35\x36\x2c\x31\x37\x36\x7a\x20\x4d\x34\x34\
+\x36\x2e\x39\x33\x38\x2c\x32\x33\x34\x2e\x36\x36\x37\x63\x2d\x39\
+\x2e\x36\x30\x35\x2d\x38\x38\x2e\x35\x33\x31\x2d\x38\x31\x2e\x30\
+\x37\x34\x2d\x31\x36\x30\x2d\x31\x36\x39\x2e\x36\x30\x35\x2d\x31\
+\x36\x39\x2e\x35\x39\x39\x56\x33\x32\x68\x2d\x34\x32\x2e\x36\x36\
+\x36\x76\x33\x33\x2e\x30\x36\x37\x0a\x09\x09\x09\x63\x2d\x38\x38\
+\x2e\x35\x33\x31\x2c\x39\x2e\x35\x39\x39\x2d\x31\x36\x30\x2c\x38\
+\x31\x2e\x30\x36\x38\x2d\x31\x36\x39\x2e\x36\x30\x34\x2c\x31\x36\
+\x39\x2e\x35\x39\x39\x48\x33\x32\x76\x34\x32\x2e\x36\x36\x37\x68\
+\x33\x33\x2e\x30\x36\x32\x63\x39\x2e\x36\x30\x34\x2c\x38\x38\x2e\
+\x35\x33\x31\x2c\x38\x31\x2e\x30\x37\x32\x2c\x31\x36\x30\x2c\x31\
+\x36\x39\x2e\x36\x30\x34\x2c\x31\x36\x39\x2e\x36\x30\x34\x56\x34\
+\x38\x30\x68\x34\x32\x2e\x36\x36\x36\x76\x2d\x33\x33\x2e\x30\x36\
+\x32\x0a\x09\x09\x09\x63\x38\x38\x2e\x35\x33\x31\x2d\x39\x2e\x36\
+\x30\x34\x2c\x31\x36\x30\x2d\x38\x31\x2e\x30\x37\x33\x2c\x31\x36\
+\x39\x2e\x36\x30\x35\x2d\x31\x36\x39\x2e\x36\x30\x34\x48\x34\x38\
+\x30\x76\x2d\x34\x32\x2e\x36\x36\x37\x48\x34\x34\x36\x2e\x39\x33\
+\x38\x7a\x20\x4d\x32\x35\x36\x2c\x34\x30\x35\x2e\x33\x33\x33\x63\
+\x2d\x38\x32\x2e\x31\x33\x37\x2c\x30\x2d\x31\x34\x39\x2e\x33\x33\
+\x34\x2d\x36\x37\x2e\x31\x39\x38\x2d\x31\x34\x39\x2e\x33\x33\x34\
+\x2d\x31\x34\x39\x2e\x33\x33\x33\x0a\x09\x09\x09\x63\x30\x2d\x38\
+\x32\x2e\x31\x33\x36\x2c\x36\x37\x2e\x31\x39\x37\x2d\x31\x34\x39\
+\x2e\x33\x33\x33\x2c\x31\x34\x39\x2e\x33\x33\x34\x2d\x31\x34\x39\
+\x2e\x33\x33\x33\x63\x38\x32\x2e\x31\x33\x35\x2c\x30\x2c\x31\x34\
+\x39\x2e\x33\x33\x32\x2c\x36\x37\x2e\x31\x39\x38\x2c\x31\x34\x39\
+\x2e\x33\x33\x32\x2c\x31\x34\x39\x2e\x33\x33\x33\x43\x34\x30\x35\
+\x2e\x33\x33\x32\x2c\x33\x33\x38\x2e\x31\x33\x35\x2c\x33\x33\x38\
+\x2e\x31\x33\x35\x2c\x34\x30\x35\x2e\x33\x33\x33\x2c\x32\x35\x36\
+\x2c\x34\x30\x35\x2e\x33\x33\x33\x7a\x0a\x09\x09\x09\x22\x2f\x3e\
+\x0a\x09\x3c\x2f\x67\x3e\x0a\x3c\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\
+\x67\x3e\x0a\
+\x00\x00\x03\xd9\
\x3c\
\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
\x2d\x38\x22\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x47\x65\x6e\x65\x72\
\x61\x74\x6f\x72\x3a\x20\x41\x64\x6f\x62\x65\x20\x49\x6c\x6c\x75\
-\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x39\x2e\x32\x2e\x31\x2c\x20\
+\x73\x74\x72\x61\x74\x6f\x72\x20\x31\x38\x2e\x31\x2e\x31\x2c\x20\
\x53\x56\x47\x20\x45\x78\x70\x6f\x72\x74\x20\x50\x6c\x75\x67\x2d\
\x49\x6e\x20\x2e\x20\x53\x56\x47\x20\x56\x65\x72\x73\x69\x6f\x6e\
\x3a\x20\x36\x2e\x30\x30\x20\x42\x75\x69\x6c\x64\x20\x30\x29\x20\
@@ -2335,161 +2427,54 @@ qt_resource_data = b"\
\x77\x33\x2e\x6f\x72\x67\x2f\x47\x72\x61\x70\x68\x69\x63\x73\x2f\
\x53\x56\x47\x2f\x31\x2e\x31\x2f\x44\x54\x44\x2f\x73\x76\x67\x31\
\x31\x2e\x64\x74\x64\x22\x3e\x0a\x3c\x73\x76\x67\x20\x76\x65\x72\
-\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x0a\x09\x20\x69\x64\x3d\
-\x22\x73\x76\x67\x34\x36\x31\x39\x22\x20\x69\x6e\x6b\x73\x63\x61\
-\x70\x65\x3a\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x30\x2e\x39\x31\
-\x2b\x64\x65\x76\x65\x6c\x2b\x6f\x73\x78\x6d\x65\x6e\x75\x20\x72\
-\x31\x32\x39\x31\x31\x22\x20\x73\x6f\x64\x69\x70\x6f\x64\x69\x3a\
-\x64\x6f\x63\x6e\x61\x6d\x65\x3d\x22\x74\x72\x69\x61\x6e\x67\x6c\
-\x65\x2d\x73\x74\x72\x6f\x6b\x65\x64\x2d\x31\x35\x2e\x73\x76\x67\
-\x22\x20\x78\x6d\x6c\x6e\x73\x3a\x63\x63\x3d\x22\x68\x74\x74\x70\
-\x3a\x2f\x2f\x63\x72\x65\x61\x74\x69\x76\x65\x63\x6f\x6d\x6d\x6f\
-\x6e\x73\x2e\x6f\x72\x67\x2f\x6e\x73\x23\x22\x20\x78\x6d\x6c\x6e\
-\x73\x3a\x64\x63\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x70\x75\x72\
-\x6c\x2e\x6f\x72\x67\x2f\x64\x63\x2f\x65\x6c\x65\x6d\x65\x6e\x74\
-\x73\x2f\x31\x2e\x31\x2f\x22\x20\x78\x6d\x6c\x6e\x73\x3a\x69\x6e\
-\x6b\x73\x63\x61\x70\x65\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\
-\x77\x77\x2e\x69\x6e\x6b\x73\x63\x61\x70\x65\x2e\x6f\x72\x67\x2f\
-\x6e\x61\x6d\x65\x73\x70\x61\x63\x65\x73\x2f\x69\x6e\x6b\x73\x63\
-\x61\x70\x65\x22\x20\x78\x6d\x6c\x6e\x73\x3a\x72\x64\x66\x3d\x22\
-\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\
-\x67\x2f\x31\x39\x39\x39\x2f\x30\x32\x2f\x32\x32\x2d\x72\x64\x66\
-\x2d\x73\x79\x6e\x74\x61\x78\x2d\x6e\x73\x23\x22\x20\x78\x6d\x6c\
-\x6e\x73\x3a\x73\x6f\x64\x69\x70\x6f\x64\x69\x3d\x22\x68\x74\x74\
-\x70\x3a\x2f\x2f\x73\x6f\x64\x69\x70\x6f\x64\x69\x2e\x73\x6f\x75\
-\x72\x63\x65\x66\x6f\x72\x67\x65\x2e\x6e\x65\x74\x2f\x44\x54\x44\
-\x2f\x73\x6f\x64\x69\x70\x6f\x64\x69\x2d\x30\x2e\x64\x74\x64\x22\
-\x20\x78\x6d\x6c\x6e\x73\x3a\x73\x76\x67\x3d\x22\x68\x74\x74\x70\
-\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x32\x30\
-\x30\x30\x2f\x73\x76\x67\x22\x0a\x09\x20\x78\x6d\x6c\x6e\x73\x3d\
-\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\
-\x72\x67\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\
-\x6e\x73\x3a\x78\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\
-\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\
-\x2f\x78\x6c\x69\x6e\x6b\x22\x20\x78\x3d\x22\x30\x70\x78\x22\x20\
-\x79\x3d\x22\x30\x70\x78\x22\x20\x77\x69\x64\x74\x68\x3d\x22\x36\
-\x34\x70\x78\x22\x20\x68\x65\x69\x67\x68\x74\x3d\x22\x36\x34\x70\
-\x78\x22\x0a\x09\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\x20\
-\x30\x20\x31\x35\x20\x31\x35\x22\x20\x73\x74\x79\x6c\x65\x3d\x22\
-\x65\x6e\x61\x62\x6c\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\
-\x64\x3a\x6e\x65\x77\x20\x30\x20\x30\x20\x31\x35\x20\x31\x35\x3b\
-\x22\x20\x78\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\x65\
-\x73\x65\x72\x76\x65\x22\x3e\x0a\x3c\x70\x61\x74\x68\x20\x69\x64\
-\x3d\x22\x72\x65\x63\x74\x33\x33\x33\x38\x22\x20\x69\x6e\x6b\x73\
-\x63\x61\x70\x65\x3a\x63\x6f\x6e\x6e\x65\x63\x74\x6f\x72\x2d\x63\
-\x75\x72\x76\x61\x74\x75\x72\x65\x3d\x22\x30\x22\x20\x73\x6f\x64\
-\x69\x70\x6f\x64\x69\x3a\x6e\x6f\x64\x65\x74\x79\x70\x65\x73\x3d\
-\x22\x63\x63\x63\x63\x63\x63\x63\x63\x63\x63\x63\x63\x22\x20\x64\
-\x3d\x22\x4d\x37\x2e\x35\x32\x34\x33\x2c\x31\x2e\x35\x30\x30\x34\
-\x0a\x09\x43\x37\x2e\x32\x34\x32\x39\x2c\x31\x2e\x34\x39\x31\x33\
-\x2c\x36\x2e\x39\x37\x38\x37\x2c\x31\x2e\x36\x34\x32\x33\x2c\x36\
-\x2e\x38\x33\x33\x36\x2c\x31\x2e\x38\x39\x35\x32\x6c\x2d\x35\x2e\
-\x35\x2c\x39\x2e\x38\x36\x39\x32\x43\x31\x2e\x30\x32\x31\x38\x2c\
-\x31\x32\x2e\x33\x30\x37\x38\x2c\x31\x2e\x33\x39\x35\x2c\x31\x32\
-\x2e\x39\x39\x39\x39\x2c\x32\x2c\x31\x33\x68\x31\x31\x0a\x09\x63\
-\x30\x2e\x36\x30\x35\x2d\x30\x2e\x30\x30\x30\x31\x2c\x30\x2e\x39\
-\x37\x38\x32\x2d\x30\x2e\x36\x39\x32\x32\x2c\x30\x2e\x36\x36\x36\
-\x34\x2d\x31\x2e\x32\x33\x35\x35\x6c\x2d\x35\x2e\x35\x2d\x39\x2e\
-\x38\x36\x39\x32\x43\x38\x2e\x30\x33\x30\x32\x2c\x31\x2e\x36\x35\
-\x37\x39\x2c\x37\x2e\x37\x38\x38\x34\x2c\x31\x2e\x35\x30\x39\x32\
-\x2c\x37\x2e\x35\x32\x34\x33\x2c\x31\x2e\x35\x30\x30\x34\x7a\x20\
-\x4d\x37\x2e\x35\x2c\x33\x2e\x38\x39\x39\x33\x6c\x34\x2e\x31\x32\
-\x36\x37\x2c\x37\x2e\x34\x37\x30\x34\x0a\x09\x48\x33\x2e\x33\x37\
-\x33\x33\x4c\x37\x2e\x35\x2c\x33\x2e\x38\x39\x39\x33\x7a\x22\x2f\
-\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\
-\x00\x00\x05\x9c\
-\x3c\
-\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x27\x31\x2e\
-\x30\x27\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x27\x55\x54\x46\
-\x2d\x38\x27\x3f\x3e\x0a\x3c\x21\x2d\x2d\x20\x54\x68\x69\x73\x20\
-\x66\x69\x6c\x65\x20\x77\x61\x73\x20\x67\x65\x6e\x65\x72\x61\x74\
-\x65\x64\x20\x62\x79\x20\x64\x76\x69\x73\x76\x67\x6d\x20\x32\x2e\
-\x31\x31\x2e\x31\x20\x2d\x2d\x3e\x0a\x3c\x73\x76\x67\x20\x76\x65\
-\x72\x73\x69\x6f\x6e\x3d\x27\x31\x2e\x31\x27\x20\x78\x6d\x6c\x6e\
-\x73\x3d\x27\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\
-\x2e\x6f\x72\x67\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x27\x20\x78\
-\x6d\x6c\x6e\x73\x3a\x78\x6c\x69\x6e\x6b\x3d\x27\x68\x74\x74\x70\
-\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\
-\x39\x39\x2f\x78\x6c\x69\x6e\x6b\x27\x20\x77\x69\x64\x74\x68\x3d\
-\x27\x36\x33\x2e\x39\x39\x39\x36\x70\x74\x27\x20\x68\x65\x69\x67\
-\x68\x74\x3d\x27\x36\x34\x70\x74\x27\x20\x76\x69\x65\x77\x42\x6f\
-\x78\x3d\x27\x35\x36\x2e\x34\x30\x39\x34\x20\x31\x31\x37\x2e\x38\
-\x35\x38\x20\x36\x33\x2e\x39\x39\x39\x36\x20\x36\x34\x27\x3e\x0a\
-\x3c\x67\x20\x69\x64\x3d\x27\x70\x61\x67\x65\x31\x27\x3e\x0a\x3c\
-\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\x6d\x3d\x27\x74\x72\x61\
-\x6e\x73\x6c\x61\x74\x65\x28\x35\x36\x2e\x34\x30\x39\x34\x20\x31\
-\x31\x37\x2e\x38\x35\x38\x29\x73\x63\x61\x6c\x65\x28\x2e\x39\x39\
-\x36\x32\x36\x34\x29\x27\x3e\x0a\x3c\x70\x61\x74\x68\x20\x64\x3d\
-\x27\x4d\x20\x35\x34\x2e\x38\x39\x32\x36\x20\x32\x34\x2e\x35\x32\
-\x39\x31\x43\x20\x35\x34\x2e\x38\x39\x32\x36\x20\x32\x30\x2e\x33\
-\x33\x36\x38\x20\x34\x34\x2e\x36\x39\x36\x39\x20\x31\x36\x2e\x39\
-\x33\x38\x33\x20\x33\x32\x2e\x31\x32\x20\x31\x36\x2e\x39\x33\x38\
-\x33\x43\x20\x31\x39\x2e\x35\x34\x33\x31\x20\x31\x36\x2e\x39\x33\
-\x38\x33\x20\x39\x2e\x33\x34\x37\x34\x32\x20\x32\x30\x2e\x33\x33\
-\x36\x38\x20\x39\x2e\x33\x34\x37\x34\x32\x20\x32\x34\x2e\x35\x32\
-\x39\x31\x43\x20\x39\x2e\x33\x34\x37\x34\x32\x20\x32\x38\x2e\x37\
-\x32\x31\x35\x20\x31\x39\x2e\x35\x34\x33\x31\x20\x33\x32\x2e\x31\
-\x32\x20\x33\x32\x2e\x31\x32\x20\x33\x32\x2e\x31\x32\x43\x20\x34\
-\x34\x2e\x36\x39\x36\x39\x20\x33\x32\x2e\x31\x32\x20\x35\x34\x2e\
-\x38\x39\x32\x36\x20\x32\x38\x2e\x37\x32\x31\x35\x20\x35\x34\x2e\
-\x38\x39\x32\x36\x20\x32\x34\x2e\x35\x32\x39\x31\x5a\x27\x20\x66\
-\x69\x6c\x6c\x3d\x27\x6e\x6f\x6e\x65\x27\x20\x73\x74\x72\x6f\x6b\
-\x65\x3d\x27\x23\x30\x30\x30\x30\x30\x30\x27\x20\x73\x74\x72\x6f\
-\x6b\x65\x2d\x6c\x69\x6e\x65\x63\x61\x70\x3d\x27\x72\x6f\x75\x6e\
-\x64\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6c\x69\x6e\x65\x6a\x6f\
-\x69\x6e\x3d\x27\x72\x6f\x75\x6e\x64\x27\x20\x73\x74\x72\x6f\x6b\
-\x65\x2d\x6d\x69\x74\x65\x72\x6c\x69\x6d\x69\x74\x3d\x27\x31\x30\
-\x2e\x30\x33\x37\x35\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x77\x69\
-\x64\x74\x68\x3d\x27\x33\x2e\x35\x31\x33\x31\x32\x27\x2f\x3e\x0a\
-\x3c\x2f\x67\x3e\x0a\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\
-\x6d\x3d\x27\x74\x72\x61\x6e\x73\x6c\x61\x74\x65\x28\x35\x36\x2e\
-\x34\x30\x39\x34\x20\x31\x31\x37\x2e\x38\x35\x38\x29\x73\x63\x61\
-\x6c\x65\x28\x2e\x39\x39\x36\x32\x36\x34\x29\x27\x3e\x0a\x3c\x70\
-\x61\x74\x68\x20\x64\x3d\x27\x4d\x20\x39\x2e\x33\x34\x37\x34\x32\
-\x20\x32\x34\x2e\x35\x32\x39\x31\x4c\x20\x39\x2e\x33\x34\x37\x34\
-\x32\x20\x35\x34\x2e\x38\x39\x32\x36\x4c\x20\x39\x2e\x33\x34\x37\
-\x34\x32\x20\x35\x34\x2e\x38\x39\x32\x36\x43\x20\x39\x2e\x33\x34\
-\x37\x34\x32\x20\x35\x34\x2e\x38\x39\x32\x36\x20\x39\x2e\x33\x34\
-\x37\x34\x32\x20\x35\x34\x2e\x38\x39\x32\x36\x20\x39\x2e\x33\x34\
-\x37\x34\x32\x20\x35\x34\x2e\x38\x39\x32\x36\x43\x20\x39\x2e\x33\
-\x34\x37\x34\x32\x20\x35\x39\x2e\x30\x38\x34\x39\x20\x31\x39\x2e\
-\x35\x34\x33\x31\x20\x36\x32\x2e\x34\x38\x33\x34\x20\x33\x32\x2e\
-\x31\x32\x20\x36\x32\x2e\x34\x38\x33\x34\x43\x20\x34\x34\x2e\x36\
-\x39\x36\x39\x20\x36\x32\x2e\x34\x38\x33\x34\x20\x35\x34\x2e\x38\
-\x39\x32\x36\x20\x35\x39\x2e\x30\x38\x34\x39\x20\x35\x34\x2e\x38\
-\x39\x32\x36\x20\x35\x34\x2e\x38\x39\x32\x36\x4c\x20\x35\x34\x2e\
-\x38\x39\x32\x36\x20\x35\x34\x2e\x38\x39\x32\x36\x4c\x20\x35\x34\
-\x2e\x38\x39\x32\x36\x20\x32\x34\x2e\x35\x32\x39\x31\x27\x20\x66\
-\x69\x6c\x6c\x3d\x27\x6e\x6f\x6e\x65\x27\x20\x73\x74\x72\x6f\x6b\
-\x65\x3d\x27\x23\x30\x30\x30\x30\x30\x30\x27\x20\x73\x74\x72\x6f\
-\x6b\x65\x2d\x6c\x69\x6e\x65\x63\x61\x70\x3d\x27\x72\x6f\x75\x6e\
-\x64\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6c\x69\x6e\x65\x6a\x6f\
-\x69\x6e\x3d\x27\x72\x6f\x75\x6e\x64\x27\x20\x73\x74\x72\x6f\x6b\
-\x65\x2d\x6d\x69\x74\x65\x72\x6c\x69\x6d\x69\x74\x3d\x27\x31\x30\
-\x2e\x30\x33\x37\x35\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x77\x69\
-\x64\x74\x68\x3d\x27\x33\x2e\x35\x31\x33\x31\x32\x27\x2f\x3e\x0a\
-\x3c\x2f\x67\x3e\x0a\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\x72\
-\x6d\x3d\x27\x74\x72\x61\x6e\x73\x6c\x61\x74\x65\x28\x35\x36\x2e\
-\x34\x30\x39\x34\x20\x31\x31\x37\x2e\x38\x35\x38\x29\x73\x63\x61\
-\x6c\x65\x28\x2e\x39\x39\x36\x32\x36\x34\x29\x27\x3e\x0a\x3c\x70\
-\x61\x74\x68\x20\x64\x3d\x27\x4d\x20\x35\x34\x2e\x38\x39\x32\x36\
-\x20\x32\x34\x2e\x35\x32\x39\x31\x43\x20\x35\x34\x2e\x38\x39\x32\
-\x36\x20\x31\x31\x2e\x39\x35\x32\x32\x20\x34\x34\x2e\x36\x39\x36\
-\x39\x20\x31\x2e\x37\x35\x36\x35\x36\x20\x33\x32\x2e\x31\x32\x20\
-\x31\x2e\x37\x35\x36\x35\x36\x43\x20\x31\x39\x2e\x35\x34\x33\x31\
-\x20\x31\x2e\x37\x35\x36\x35\x36\x20\x39\x2e\x33\x34\x37\x34\x32\
-\x20\x31\x31\x2e\x39\x35\x32\x32\x20\x39\x2e\x33\x34\x37\x34\x32\
-\x20\x32\x34\x2e\x35\x32\x39\x31\x27\x20\x66\x69\x6c\x6c\x3d\x27\
-\x6e\x6f\x6e\x65\x27\x20\x73\x74\x72\x6f\x6b\x65\x3d\x27\x23\x30\
-\x30\x30\x30\x30\x30\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6c\x69\
-\x6e\x65\x63\x61\x70\x3d\x27\x72\x6f\x75\x6e\x64\x27\x20\x73\x74\
-\x72\x6f\x6b\x65\x2d\x6c\x69\x6e\x65\x6a\x6f\x69\x6e\x3d\x27\x72\
-\x6f\x75\x6e\x64\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x6d\x69\x74\
-\x65\x72\x6c\x69\x6d\x69\x74\x3d\x27\x31\x30\x2e\x30\x33\x37\x35\
-\x27\x20\x73\x74\x72\x6f\x6b\x65\x2d\x77\x69\x64\x74\x68\x3d\x27\
-\x33\x2e\x35\x31\x33\x31\x32\x27\x2f\x3e\x0a\x3c\x2f\x67\x3e\x0a\
-\x3c\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\
-\x00\x00\x02\xee\
+\x73\x69\x6f\x6e\x3d\x22\x31\x2e\x31\x22\x20\x69\x64\x3d\x22\x43\
+\x68\x65\x76\x72\x6f\x6e\x5f\x63\x69\x72\x63\x6c\x65\x64\x5f\x72\
+\x69\x67\x68\x74\x22\x20\x78\x6d\x6c\x6e\x73\x3d\x22\x68\x74\x74\
+\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x32\
+\x30\x30\x30\x2f\x73\x76\x67\x22\x20\x78\x6d\x6c\x6e\x73\x3a\x78\
+\x6c\x69\x6e\x6b\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\
+\x2e\x77\x33\x2e\x6f\x72\x67\x2f\x31\x39\x39\x39\x2f\x78\x6c\x69\
+\x6e\x6b\x22\x0a\x09\x20\x78\x3d\x22\x30\x70\x78\x22\x20\x79\x3d\
+\x22\x30\x70\x78\x22\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\
+\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\x65\x6e\x61\x62\
+\x6c\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\x75\x6e\x64\x3d\x22\x6e\
+\x65\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\x35\x31\x32\x22\x20\
+\x78\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\x22\x70\x72\x65\x73\x65\
+\x72\x76\x65\x22\x3e\x0a\x3c\x67\x20\x74\x72\x61\x6e\x73\x66\x6f\
+\x72\x6d\x3d\x27\x6d\x61\x74\x72\x69\x78\x28\x32\x34\x20\x30\x20\
+\x30\x20\x32\x34\x20\x30\x20\x30\x29\x27\x3e\x0a\x3c\x70\x61\x74\
+\x68\x20\x64\x3d\x22\x4d\x31\x31\x2c\x31\x30\x4c\x38\x2e\x36\x39\
+\x38\x2c\x37\x2e\x34\x39\x34\x63\x2d\x30\x2e\x31\x39\x36\x2d\x30\
+\x2e\x31\x39\x38\x2d\x30\x2e\x31\x39\x36\x2d\x30\x2e\x35\x31\x39\
+\x2c\x30\x2d\x30\x2e\x37\x31\x38\x63\x30\x2e\x31\x39\x36\x2d\x30\
+\x2e\x31\x39\x37\x2c\x30\x2e\x35\x31\x35\x2d\x30\x2e\x31\x39\x37\
+\x2c\x30\x2e\x37\x31\x2c\x30\x6c\x32\x2e\x38\x30\x37\x2c\x32\x2e\
+\x38\x36\x34\x0a\x09\x63\x30\x2e\x31\x39\x36\x2c\x30\x2e\x31\x39\
+\x39\x2c\x30\x2e\x31\x39\x36\x2c\x30\x2e\x35\x32\x2c\x30\x2c\x30\
+\x2e\x37\x31\x37\x6c\x2d\x32\x2e\x38\x30\x37\x2c\x32\x2e\x38\x36\
+\x34\x63\x2d\x30\x2e\x31\x39\x35\x2c\x30\x2e\x31\x39\x39\x2d\x30\
+\x2e\x35\x31\x34\x2c\x30\x2e\x31\x39\x38\x2d\x30\x2e\x37\x31\x2c\
+\x30\x63\x2d\x30\x2e\x31\x39\x36\x2d\x30\x2e\x31\x39\x37\x2d\x30\
+\x2e\x31\x39\x36\x2d\x30\x2e\x35\x31\x38\x2c\x30\x2d\x30\x2e\x37\
+\x31\x37\x4c\x31\x31\x2c\x31\x30\x7a\x20\x4d\x31\x30\x2c\x30\x2e\
+\x34\x0a\x09\x63\x35\x2e\x33\x30\x32\x2c\x30\x2c\x39\x2e\x36\x2c\
+\x34\x2e\x32\x39\x38\x2c\x39\x2e\x36\x2c\x39\x2e\x36\x63\x30\x2c\
+\x35\x2e\x33\x30\x33\x2d\x34\x2e\x32\x39\x38\x2c\x39\x2e\x36\x2d\
+\x39\x2e\x36\x2c\x39\x2e\x36\x53\x30\x2e\x34\x2c\x31\x35\x2e\x33\
+\x30\x33\x2c\x30\x2e\x34\x2c\x31\x30\x43\x30\x2e\x34\x2c\x34\x2e\
+\x36\x39\x38\x2c\x34\x2e\x36\x39\x38\x2c\x30\x2e\x34\x2c\x31\x30\
+\x2c\x30\x2e\x34\x7a\x20\x4d\x31\x30\x2c\x31\x38\x2e\x33\x35\x34\
+\x0a\x09\x63\x34\x2e\x36\x31\x33\x2c\x30\x2c\x38\x2e\x33\x35\x34\
+\x2d\x33\x2e\x37\x34\x2c\x38\x2e\x33\x35\x34\x2d\x38\x2e\x33\x35\
+\x34\x63\x30\x2d\x34\x2e\x36\x31\x34\x2d\x33\x2e\x37\x34\x31\x2d\
+\x38\x2e\x33\x35\x34\x2d\x38\x2e\x33\x35\x34\x2d\x38\x2e\x33\x35\
+\x34\x63\x2d\x34\x2e\x36\x31\x35\x2c\x30\x2d\x38\x2e\x33\x35\x34\
+\x2c\x33\x2e\x37\x34\x2d\x38\x2e\x33\x35\x34\x2c\x38\x2e\x33\x35\
+\x34\x0a\x09\x43\x31\x2e\x36\x34\x35\x2c\x31\x34\x2e\x36\x31\x34\
+\x2c\x35\x2e\x33\x38\x35\x2c\x31\x38\x2e\x33\x35\x34\x2c\x31\x30\
+\x2c\x31\x38\x2e\x33\x35\x34\x7a\x22\x2f\x3e\x0a\x3c\x2f\x67\x3e\
+\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\
+\x00\x00\x03\xdc\
\x3c\
\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
@@ -2520,24 +2505,39 @@ qt_resource_data = b"\
\x3d\x22\x65\x6e\x61\x62\x6c\x65\x2d\x62\x61\x63\x6b\x67\x72\x6f\
\x75\x6e\x64\x3a\x6e\x65\x77\x20\x30\x20\x30\x20\x35\x31\x32\x20\
\x35\x31\x32\x3b\x22\x20\x78\x6d\x6c\x3a\x73\x70\x61\x63\x65\x3d\
-\x22\x70\x72\x65\x73\x65\x72\x76\x65\x22\x3e\x0a\x3c\x70\x61\x74\
-\x68\x20\x64\x3d\x22\x4d\x34\x31\x37\x2e\x34\x2c\x32\x32\x34\x48\
-\x32\x38\x38\x56\x39\x34\x2e\x36\x63\x30\x2d\x31\x36\x2e\x39\x2d\
-\x31\x34\x2e\x33\x2d\x33\x30\x2e\x36\x2d\x33\x32\x2d\x33\x30\x2e\
-\x36\x63\x2d\x31\x37\x2e\x37\x2c\x30\x2d\x33\x32\x2c\x31\x33\x2e\
-\x37\x2d\x33\x32\x2c\x33\x30\x2e\x36\x56\x32\x32\x34\x48\x39\x34\
-\x2e\x36\x43\x37\x37\x2e\x37\x2c\x32\x32\x34\x2c\x36\x34\x2c\x32\
-\x33\x38\x2e\x33\x2c\x36\x34\x2c\x32\x35\x36\x0a\x09\x63\x30\x2c\
-\x31\x37\x2e\x37\x2c\x31\x33\x2e\x37\x2c\x33\x32\x2c\x33\x30\x2e\
-\x36\x2c\x33\x32\x48\x32\x32\x34\x76\x31\x32\x39\x2e\x34\x63\x30\
-\x2c\x31\x36\x2e\x39\x2c\x31\x34\x2e\x33\x2c\x33\x30\x2e\x36\x2c\
-\x33\x32\x2c\x33\x30\x2e\x36\x63\x31\x37\x2e\x37\x2c\x30\x2c\x33\
-\x32\x2d\x31\x33\x2e\x37\x2c\x33\x32\x2d\x33\x30\x2e\x36\x56\x32\
-\x38\x38\x68\x31\x32\x39\x2e\x34\x63\x31\x36\x2e\x39\x2c\x30\x2c\
-\x33\x30\x2e\x36\x2d\x31\x34\x2e\x33\x2c\x33\x30\x2e\x36\x2d\x33\
-\x32\x0a\x09\x43\x34\x34\x38\x2c\x32\x33\x38\x2e\x33\x2c\x34\x33\
-\x34\x2e\x33\x2c\x32\x32\x34\x2c\x34\x31\x37\x2e\x34\x2c\x32\x32\
-\x34\x7a\x22\x2f\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\
+\x22\x70\x72\x65\x73\x65\x72\x76\x65\x22\x3e\x0a\x3c\x67\x3e\x0a\
+\x09\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x32\x35\x36\x2c\x31\
+\x32\x38\x63\x2d\x38\x31\x2e\x39\x2c\x30\x2d\x31\x34\x35\x2e\x37\
+\x2c\x34\x38\x2e\x38\x2d\x32\x32\x34\x2c\x31\x32\x38\x63\x36\x37\
+\x2e\x34\x2c\x36\x37\x2e\x37\x2c\x31\x32\x34\x2c\x31\x32\x38\x2c\
+\x32\x32\x34\x2c\x31\x32\x38\x63\x39\x39\x2e\x39\x2c\x30\x2c\x31\
+\x37\x33\x2e\x34\x2d\x37\x36\x2e\x34\x2c\x32\x32\x34\x2d\x31\x32\
+\x36\x2e\x36\x0a\x09\x09\x43\x34\x32\x38\x2e\x32\x2c\x31\x39\x38\
+\x2e\x36\x2c\x33\x35\x34\x2e\x38\x2c\x31\x32\x38\x2c\x32\x35\x36\
+\x2c\x31\x32\x38\x7a\x20\x4d\x32\x35\x36\x2c\x33\x34\x37\x2e\x33\
+\x63\x2d\x34\x39\x2e\x34\x2c\x30\x2d\x38\x39\x2e\x36\x2d\x34\x31\
+\x2d\x38\x39\x2e\x36\x2d\x39\x31\x2e\x33\x63\x30\x2d\x35\x30\x2e\
+\x34\x2c\x34\x30\x2e\x32\x2d\x39\x31\x2e\x33\x2c\x38\x39\x2e\x36\
+\x2d\x39\x31\x2e\x33\x73\x38\x39\x2e\x36\x2c\x34\x31\x2c\x38\x39\
+\x2e\x36\x2c\x39\x31\x2e\x33\x0a\x09\x09\x43\x33\x34\x35\x2e\x36\
+\x2c\x33\x30\x36\x2e\x34\x2c\x33\x30\x35\x2e\x34\x2c\x33\x34\x37\
+\x2e\x33\x2c\x32\x35\x36\x2c\x33\x34\x37\x2e\x33\x7a\x22\x2f\x3e\
+\x0a\x09\x3c\x67\x3e\x0a\x09\x09\x3c\x70\x61\x74\x68\x20\x64\x3d\
+\x22\x4d\x32\x35\x36\x2c\x32\x32\x34\x63\x30\x2d\x37\x2e\x39\x2c\
+\x32\x2e\x39\x2d\x31\x35\x2e\x31\x2c\x37\x2e\x36\x2d\x32\x30\x2e\
+\x37\x63\x2d\x32\x2e\x35\x2d\x30\x2e\x34\x2d\x35\x2d\x30\x2e\x36\
+\x2d\x37\x2e\x36\x2d\x30\x2e\x36\x63\x2d\x32\x38\x2e\x38\x2c\x30\
+\x2d\x35\x32\x2e\x33\x2c\x32\x33\x2e\x39\x2d\x35\x32\x2e\x33\x2c\
+\x35\x33\x2e\x33\x63\x30\x2c\x32\x39\x2e\x34\x2c\x32\x33\x2e\x35\
+\x2c\x35\x33\x2e\x33\x2c\x35\x32\x2e\x33\x2c\x35\x33\x2e\x33\x0a\
+\x09\x09\x09\x73\x35\x32\x2e\x33\x2d\x32\x33\x2e\x39\x2c\x35\x32\
+\x2e\x33\x2d\x35\x33\x2e\x33\x63\x30\x2d\x32\x2e\x33\x2d\x30\x2e\
+\x32\x2d\x34\x2e\x36\x2d\x30\x2e\x34\x2d\x36\x2e\x39\x63\x2d\x35\
+\x2e\x35\x2c\x34\x2e\x33\x2d\x31\x32\x2e\x33\x2c\x36\x2e\x39\x2d\
+\x31\x39\x2e\x38\x2c\x36\x2e\x39\x43\x32\x37\x30\x2e\x33\x2c\x32\
+\x35\x36\x2c\x32\x35\x36\x2c\x32\x34\x31\x2e\x37\x2c\x32\x35\x36\
+\x2c\x32\x32\x34\x7a\x22\x2f\x3e\x0a\x09\x3c\x2f\x67\x3e\x0a\x3c\
+\x2f\x67\x3e\x0a\x3c\x2f\x73\x76\x67\x3e\x0a\
"
qt_resource_name = b"\
@@ -2545,250 +2545,250 @@ qt_resource_name = b"\
\x00\x6f\xa6\x53\
\x00\x69\
\x00\x63\x00\x6f\x00\x6e\x00\x73\
-\x00\x1c\
-\x08\x8a\x79\x07\
-\x00\x61\
-\x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x72\x00\x61\x00\x64\x00\x69\x00\x6f\x00\x2d\x00\x62\x00\x75\x00\x74\
-\x00\x74\x00\x6f\x00\x6e\x00\x2d\x00\x6f\x00\x66\x00\x66\x00\x2e\x00\x73\x00\x76\x00\x67\
\x00\x10\
-\x0c\x57\x65\x47\
+\x06\xe3\xaf\xe7\
\x00\x61\
-\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x2d\x00\x72\x00\x65\x00\x73\x00\x69\x00\x7a\x00\x65\x00\x2e\x00\x73\x00\x76\x00\x67\
+\x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x68\x00\x61\x00\x6e\x00\x64\x00\x2e\x00\x73\x00\x76\x00\x67\
\x00\x10\
\x08\x89\xfa\x47\
\x00\x63\
\x00\x65\x00\x6e\x00\x74\x00\x65\x00\x72\x00\x6f\x00\x72\x00\x69\x00\x67\x00\x69\x00\x6e\x00\x2e\x00\x73\x00\x76\x00\x67\
+\x00\x0a\
+\x01\xca\x6d\x87\
+\x00\x62\
+\x00\x75\x00\x63\x00\x6b\x00\x65\x00\x74\x00\x2e\x00\x73\x00\x76\x00\x67\
+\x00\x11\
+\x0c\xdb\x38\xe7\
+\x00\x61\
+\x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x63\x00\x6c\x00\x6f\x00\x73\x00\x65\x00\x2e\x00\x73\x00\x76\x00\x67\
+\
+\x00\x10\
+\x08\xe4\xaf\x47\
+\x00\x61\
+\x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x64\x00\x6f\x00\x6e\x00\x65\x00\x2e\x00\x73\x00\x76\x00\x67\
+\x00\x0f\
+\x04\xf2\xa7\x87\
+\x00\x63\
+\x00\x6c\x00\x6f\x00\x73\x00\x65\x00\x64\x00\x63\x00\x75\x00\x72\x00\x76\x00\x65\x00\x2e\x00\x73\x00\x76\x00\x67\
+\x00\x0d\
+\x05\x20\xce\x87\
+\x00\x6f\
+\x00\x70\x00\x65\x00\x6e\x00\x63\x00\x75\x00\x72\x00\x76\x00\x65\x00\x2e\x00\x73\x00\x76\x00\x67\
\x00\x08\
\x05\xa8\x57\x87\
\x00\x63\
\x00\x6f\x00\x64\x00\x65\x00\x2e\x00\x73\x00\x76\x00\x67\
-\x00\x08\
-\x04\xb2\x55\x47\
-\x00\x75\
-\x00\x6e\x00\x64\x00\x6f\x00\x2e\x00\x73\x00\x76\x00\x67\
-\x00\x0f\
-\x09\x76\x60\xc7\
+\x00\x1c\
+\x04\x66\xe1\x67\
\x00\x63\
-\x00\x6c\x00\x6f\x00\x73\x00\x65\x00\x2d\x00\x72\x00\x6f\x00\x75\x00\x6e\x00\x64\x00\x2e\x00\x73\x00\x76\x00\x67\
-\x00\x14\
-\x0f\xa5\xe0\xc7\
-\x00\x6d\
-\x00\x61\x00\x67\x00\x6e\x00\x69\x00\x66\x00\x79\x00\x69\x00\x6e\x00\x67\x00\x2d\x00\x67\x00\x6c\x00\x61\x00\x73\x00\x73\x00\x2e\
-\x00\x73\x00\x76\x00\x67\
+\x00\x68\x00\x65\x00\x76\x00\x72\x00\x6f\x00\x6e\x00\x2d\x00\x77\x00\x69\x00\x74\x00\x68\x00\x2d\x00\x63\x00\x69\x00\x72\x00\x63\
+\x00\x6c\x00\x65\x00\x2d\x00\x6c\x00\x65\x00\x66\x00\x74\x00\x2e\x00\x73\x00\x76\x00\x67\
+\x00\x08\
+\x0b\x07\x57\xa7\
+\x00\x65\
+\x00\x64\x00\x69\x00\x74\x00\x2e\x00\x73\x00\x76\x00\x67\
+\x00\x17\
+\x06\xc6\x02\xa7\
+\x00\x74\
+\x00\x72\x00\x69\x00\x61\x00\x6e\x00\x67\x00\x6c\x00\x65\x00\x2d\x00\x73\x00\x74\x00\x72\x00\x6f\x00\x6b\x00\x65\x00\x64\x00\x2d\
+\x00\x31\x00\x35\x00\x2e\x00\x73\x00\x76\x00\x67\
\x00\x11\
\x0c\xa7\xc7\x47\
\x00\x63\
\x00\x6c\x00\x6f\x00\x73\x00\x65\x00\x64\x00\x70\x00\x6f\x00\x6c\x00\x79\x00\x67\x00\x6f\x00\x6e\x00\x2e\x00\x73\x00\x76\x00\x67\
\
-\x00\x1d\
-\x06\xec\xf4\xc7\
-\x00\x63\
-\x00\x68\x00\x65\x00\x76\x00\x72\x00\x6f\x00\x6e\x00\x2d\x00\x77\x00\x69\x00\x74\x00\x68\x00\x2d\x00\x63\x00\x69\x00\x72\x00\x63\
-\x00\x6c\x00\x65\x00\x2d\x00\x72\x00\x69\x00\x67\x00\x68\x00\x74\x00\x2e\x00\x73\x00\x76\x00\x67\
-\x00\x0f\
-\x04\xf2\xa7\x87\
-\x00\x63\
-\x00\x6c\x00\x6f\x00\x73\x00\x65\x00\x64\x00\x63\x00\x75\x00\x72\x00\x76\x00\x65\x00\x2e\x00\x73\x00\x76\x00\x67\
-\x00\x09\
-\x0b\x9e\x89\x07\
-\x00\x63\
-\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x2e\x00\x73\x00\x76\x00\x67\
-\x00\x16\
-\x01\xfb\x76\x27\
-\x00\x61\
-\x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x61\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x2d\x00\x62\x00\x61\x00\x63\
-\x00\x6b\x00\x2e\x00\x73\x00\x76\x00\x67\
-\x00\x15\
-\x0f\xc4\x59\xe7\
-\x00\x73\
-\x00\x75\x00\x62\x00\x64\x00\x69\x00\x72\x00\x65\x00\x63\x00\x74\x00\x6f\x00\x72\x00\x79\x00\x2d\x00\x6c\x00\x65\x00\x66\x00\x74\
-\x00\x2e\x00\x73\x00\x76\x00\x67\
-\x00\x12\
-\x04\xb2\x21\x47\
-\x00\x61\
-\x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x65\x00\x78\x00\x70\x00\x61\x00\x6e\x00\x64\x00\x2e\x00\x73\x00\x76\
-\x00\x67\
-\x00\x08\
-\x0c\xf7\x55\x87\
-\x00\x74\
-\x00\x65\x00\x78\x00\x74\x00\x2e\x00\x73\x00\x76\x00\x67\
-\x00\x12\
-\x0c\x5e\xd4\xa7\
-\x00\x61\
-\x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x6c\x00\x6f\x00\x63\x00\x61\x00\x74\x00\x65\x00\x2e\x00\x73\x00\x76\
-\x00\x67\
-\x00\x19\
-\x0a\x43\x45\xc7\
-\x00\x61\
-\x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x61\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x2d\x00\x66\x00\x6f\x00\x72\
-\x00\x77\x00\x61\x00\x72\x00\x64\x00\x2e\x00\x73\x00\x76\x00\x67\
-\x00\x0f\
-\x07\x0e\xc4\x87\
-\x00\x6f\
-\x00\x70\x00\x65\x00\x6e\x00\x70\x00\x6f\x00\x6c\x00\x79\x00\x67\x00\x6f\x00\x6e\x00\x2e\x00\x73\x00\x76\x00\x67\
-\x00\x07\
-\x0c\xf8\x5a\x07\
-\x00\x65\
-\x00\x79\x00\x65\x00\x2e\x00\x73\x00\x76\x00\x67\
-\x00\x08\
-\x08\xc8\x55\xe7\
-\x00\x73\
-\x00\x61\x00\x76\x00\x65\x00\x2e\x00\x73\x00\x76\x00\x67\
\x00\x0a\
\x0a\x2d\x1b\xc7\
\x00\x63\
\x00\x69\x00\x72\x00\x63\x00\x6c\x00\x65\x00\x2e\x00\x73\x00\x76\x00\x67\
-\x00\x12\
-\x08\x79\x97\xe7\
-\x00\x61\
-\x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x63\x00\x61\x00\x6d\x00\x65\x00\x72\x00\x61\x00\x2e\x00\x73\x00\x76\
-\x00\x67\
-\x00\x1b\
-\x0e\xb5\x68\xe7\
+\x00\x0a\
+\x0f\x68\x53\xe7\
\x00\x61\
-\x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x72\x00\x61\x00\x64\x00\x69\x00\x6f\x00\x2d\x00\x62\x00\x75\x00\x74\
-\x00\x74\x00\x6f\x00\x6e\x00\x2d\x00\x6f\x00\x6e\x00\x2e\x00\x73\x00\x76\x00\x67\
+\x00\x6e\x00\x63\x00\x68\x00\x6f\x00\x72\x00\x2e\x00\x73\x00\x76\x00\x67\
\x00\x08\
\x0b\xb2\x55\xc7\
\x00\x72\
\x00\x65\x00\x64\x00\x6f\x00\x2e\x00\x73\x00\x76\x00\x67\
-\x00\x11\
-\x01\x60\xbc\x47\
-\x00\x73\
-\x00\x6f\x00\x63\x00\x69\x00\x61\x00\x6c\x00\x2d\x00\x70\x00\x79\x00\x74\x00\x68\x00\x6f\x00\x6e\x00\x2e\x00\x73\x00\x76\x00\x67\
-\
+\x00\x19\
+\x0a\x43\x45\xc7\
+\x00\x61\
+\x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x61\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x2d\x00\x66\x00\x6f\x00\x72\
+\x00\x77\x00\x61\x00\x72\x00\x64\x00\x2e\x00\x73\x00\x76\x00\x67\
\x00\x19\
\x0f\xef\x7b\xe7\
\x00\x61\
\x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x63\x00\x6f\x00\x6c\x00\x6f\x00\x72\x00\x2d\x00\x70\x00\x61\x00\x6c\
\x00\x65\x00\x74\x00\x74\x00\x65\x00\x2e\x00\x73\x00\x76\x00\x67\
-\x00\x10\
-\x06\xe3\xaf\xe7\
-\x00\x61\
-\x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x68\x00\x61\x00\x6e\x00\x64\x00\x2e\x00\x73\x00\x76\x00\x67\
\x00\x11\
-\x0c\xdb\x38\xe7\
-\x00\x61\
-\x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x63\x00\x6c\x00\x6f\x00\x73\x00\x65\x00\x2e\x00\x73\x00\x76\x00\x67\
+\x01\x60\xbc\x47\
+\x00\x73\
+\x00\x6f\x00\x63\x00\x69\x00\x61\x00\x6c\x00\x2d\x00\x70\x00\x79\x00\x74\x00\x68\x00\x6f\x00\x6e\x00\x2e\x00\x73\x00\x76\x00\x67\
\
+\x00\x08\
+\x0c\xf7\x55\x87\
+\x00\x74\
+\x00\x65\x00\x78\x00\x74\x00\x2e\x00\x73\x00\x76\x00\x67\
+\x00\x0e\
+\x05\xed\x38\x67\
+\x00\x61\
+\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x2d\x00\x6d\x00\x6f\x00\x76\x00\x65\x00\x2e\x00\x73\x00\x76\x00\x67\
+\x00\x12\
+\x08\x55\xef\xc7\
+\x00\x61\
+\x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x64\x00\x65\x00\x6c\x00\x65\x00\x74\x00\x65\x00\x2e\x00\x73\x00\x76\
+\x00\x67\
+\x00\x08\
+\x08\xc8\x55\xe7\
+\x00\x73\
+\x00\x61\x00\x76\x00\x65\x00\x2e\x00\x73\x00\x76\x00\x67\
\x00\x13\
\x03\x24\x75\x47\
\x00\x61\
\x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x72\x00\x65\x00\x66\x00\x72\x00\x65\x00\x73\x00\x68\x00\x2e\x00\x73\
\x00\x76\x00\x67\
-\x00\x0a\
-\x0f\x68\x53\xe7\
-\x00\x61\
-\x00\x6e\x00\x63\x00\x68\x00\x6f\x00\x72\x00\x2e\x00\x73\x00\x76\x00\x67\
\x00\x0e\
-\x05\xed\x38\x67\
+\x0f\xcb\xd5\xc7\
+\x00\x70\
+\x00\x6c\x00\x75\x00\x73\x00\x2d\x00\x72\x00\x6f\x00\x75\x00\x6e\x00\x64\x00\x2e\x00\x73\x00\x76\x00\x67\
+\x00\x12\
+\x08\x79\x97\xe7\
\x00\x61\
-\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x2d\x00\x6d\x00\x6f\x00\x76\x00\x65\x00\x2e\x00\x73\x00\x76\x00\x67\
-\x00\x10\
-\x04\xa9\x22\xc7\
-\x00\x66\
-\x00\x69\x00\x6c\x00\x6c\x00\x65\x00\x64\x00\x62\x00\x75\x00\x63\x00\x6b\x00\x65\x00\x74\x00\x2e\x00\x73\x00\x76\x00\x67\
+\x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x63\x00\x61\x00\x6d\x00\x65\x00\x72\x00\x61\x00\x2e\x00\x73\x00\x76\
+\x00\x67\
+\x00\x1c\
+\x08\x8a\x79\x07\
+\x00\x61\
+\x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x72\x00\x61\x00\x64\x00\x69\x00\x6f\x00\x2d\x00\x62\x00\x75\x00\x74\
+\x00\x74\x00\x6f\x00\x6e\x00\x2d\x00\x6f\x00\x66\x00\x66\x00\x2e\x00\x73\x00\x76\x00\x67\
+\x00\x09\
+\x0c\x9b\x89\xe7\
+\x00\x62\
+\x00\x72\x00\x75\x00\x73\x00\x68\x00\x2e\x00\x73\x00\x76\x00\x67\
+\x00\x16\
+\x01\xfb\x76\x27\
+\x00\x61\
+\x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x61\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x2d\x00\x62\x00\x61\x00\x63\
+\x00\x6b\x00\x2e\x00\x73\x00\x76\x00\x67\
\x00\x08\
\x08\xf7\x57\x07\
\x00\x67\
\x00\x72\x00\x69\x00\x64\x00\x2e\x00\x73\x00\x76\x00\x67\
-\x00\x12\
-\x08\x55\xef\xc7\
-\x00\x61\
-\x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x64\x00\x65\x00\x6c\x00\x65\x00\x74\x00\x65\x00\x2e\x00\x73\x00\x76\
-\x00\x67\
\x00\x0a\
\x0a\xc8\x62\x67\
\x00\x63\
\x00\x65\x00\x6e\x00\x74\x00\x65\x00\x72\x00\x2e\x00\x73\x00\x76\x00\x67\
+\x00\x10\
+\x04\xa9\x22\xc7\
+\x00\x66\
+\x00\x69\x00\x6c\x00\x6c\x00\x65\x00\x64\x00\x62\x00\x75\x00\x63\x00\x6b\x00\x65\x00\x74\x00\x2e\x00\x73\x00\x76\x00\x67\
+\x00\x1b\
+\x0e\xb5\x68\xe7\
+\x00\x61\
+\x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x72\x00\x61\x00\x64\x00\x69\x00\x6f\x00\x2d\x00\x62\x00\x75\x00\x74\
+\x00\x74\x00\x6f\x00\x6e\x00\x2d\x00\x6f\x00\x6e\x00\x2e\x00\x73\x00\x76\x00\x67\
+\x00\x14\
+\x0f\xa5\xe0\xc7\
+\x00\x6d\
+\x00\x61\x00\x67\x00\x6e\x00\x69\x00\x66\x00\x79\x00\x69\x00\x6e\x00\x67\x00\x2d\x00\x67\x00\x6c\x00\x61\x00\x73\x00\x73\x00\x2e\
+\x00\x73\x00\x76\x00\x67\
+\x00\x15\
+\x0f\xc4\x59\xe7\
+\x00\x73\
+\x00\x75\x00\x62\x00\x64\x00\x69\x00\x72\x00\x65\x00\x63\x00\x74\x00\x6f\x00\x72\x00\x79\x00\x2d\x00\x6c\x00\x65\x00\x66\x00\x74\
+\x00\x2e\x00\x73\x00\x76\x00\x67\
+\x00\x0f\
+\x07\x0e\xc4\x87\
+\x00\x6f\
+\x00\x70\x00\x65\x00\x6e\x00\x70\x00\x6f\x00\x6c\x00\x79\x00\x67\x00\x6f\x00\x6e\x00\x2e\x00\x73\x00\x76\x00\x67\
\x00\x08\
-\x0b\x07\x57\xa7\
-\x00\x65\
-\x00\x64\x00\x69\x00\x74\x00\x2e\x00\x73\x00\x76\x00\x67\
+\x04\xb2\x55\x47\
+\x00\x75\
+\x00\x6e\x00\x64\x00\x6f\x00\x2e\x00\x73\x00\x76\x00\x67\
+\x00\x12\
+\x04\xb2\x21\x47\
+\x00\x61\
+\x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x65\x00\x78\x00\x70\x00\x61\x00\x6e\x00\x64\x00\x2e\x00\x73\x00\x76\
+\x00\x67\
+\x00\x10\
+\x0c\x57\x65\x47\
+\x00\x61\
+\x00\x72\x00\x72\x00\x6f\x00\x77\x00\x2d\x00\x72\x00\x65\x00\x73\x00\x69\x00\x7a\x00\x65\x00\x2e\x00\x73\x00\x76\x00\x67\
\x00\x17\
\x07\x87\x48\x27\
\x00\x61\
\x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x66\x00\x6f\x00\x6c\x00\x64\x00\x65\x00\x72\x00\x2d\x00\x6f\x00\x70\
\x00\x65\x00\x6e\x00\x2e\x00\x73\x00\x76\x00\x67\
-\x00\x10\
-\x08\xe4\xaf\x47\
+\x00\x09\
+\x0b\x9e\x89\x07\
+\x00\x63\
+\x00\x68\x00\x65\x00\x63\x00\x6b\x00\x2e\x00\x73\x00\x76\x00\x67\
+\x00\x0f\
+\x09\x76\x60\xc7\
+\x00\x63\
+\x00\x6c\x00\x6f\x00\x73\x00\x65\x00\x2d\x00\x72\x00\x6f\x00\x75\x00\x6e\x00\x64\x00\x2e\x00\x73\x00\x76\x00\x67\
+\x00\x12\
+\x0c\x5e\xd4\xa7\
\x00\x61\
-\x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x64\x00\x6f\x00\x6e\x00\x65\x00\x2e\x00\x73\x00\x76\x00\x67\
-\x00\x1c\
-\x04\x66\xe1\x67\
+\x00\x6e\x00\x64\x00\x72\x00\x6f\x00\x69\x00\x64\x00\x2d\x00\x6c\x00\x6f\x00\x63\x00\x61\x00\x74\x00\x65\x00\x2e\x00\x73\x00\x76\
+\x00\x67\
+\x00\x1d\
+\x06\xec\xf4\xc7\
\x00\x63\
\x00\x68\x00\x65\x00\x76\x00\x72\x00\x6f\x00\x6e\x00\x2d\x00\x77\x00\x69\x00\x74\x00\x68\x00\x2d\x00\x63\x00\x69\x00\x72\x00\x63\
-\x00\x6c\x00\x65\x00\x2d\x00\x6c\x00\x65\x00\x66\x00\x74\x00\x2e\x00\x73\x00\x76\x00\x67\
-\x00\x09\
-\x0c\x9b\x89\xe7\
-\x00\x62\
-\x00\x72\x00\x75\x00\x73\x00\x68\x00\x2e\x00\x73\x00\x76\x00\x67\
-\x00\x0d\
-\x05\x20\xce\x87\
-\x00\x6f\
-\x00\x70\x00\x65\x00\x6e\x00\x63\x00\x75\x00\x72\x00\x76\x00\x65\x00\x2e\x00\x73\x00\x76\x00\x67\
-\x00\x17\
-\x06\xc6\x02\xa7\
-\x00\x74\
-\x00\x72\x00\x69\x00\x61\x00\x6e\x00\x67\x00\x6c\x00\x65\x00\x2d\x00\x73\x00\x74\x00\x72\x00\x6f\x00\x6b\x00\x65\x00\x64\x00\x2d\
-\x00\x31\x00\x35\x00\x2e\x00\x73\x00\x76\x00\x67\
-\x00\x0a\
-\x01\xca\x6d\x87\
-\x00\x62\
-\x00\x75\x00\x63\x00\x6b\x00\x65\x00\x74\x00\x2e\x00\x73\x00\x76\x00\x67\
-\x00\x0e\
-\x0f\xcb\xd5\xc7\
-\x00\x70\
-\x00\x6c\x00\x75\x00\x73\x00\x2d\x00\x72\x00\x6f\x00\x75\x00\x6e\x00\x64\x00\x2e\x00\x73\x00\x76\x00\x67\
+\x00\x6c\x00\x65\x00\x2d\x00\x72\x00\x69\x00\x67\x00\x68\x00\x74\x00\x2e\x00\x73\x00\x76\x00\x67\
+\x00\x07\
+\x0c\xf8\x5a\x07\
+\x00\x65\
+\x00\x79\x00\x65\x00\x2e\x00\x73\x00\x76\x00\x67\
"
qt_resource_struct_v1 = b"\
\x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x01\
\x00\x00\x00\x00\x00\x02\x00\x00\x00\x2c\x00\x00\x00\x02\
-\x00\x00\x03\xa4\x00\x00\x00\x00\x00\x01\x00\x00\x4e\xfb\
-\x00\x00\x06\x54\x00\x00\x00\x00\x00\x01\x00\x00\x8f\x67\
-\x00\x00\x01\xbc\x00\x00\x00\x00\x00\x01\x00\x00\x28\xd9\
-\x00\x00\x04\x52\x00\x00\x00\x00\x00\x01\x00\x00\x63\xf2\
-\x00\x00\x05\xaa\x00\x00\x00\x00\x00\x01\x00\x00\x7e\x58\
-\x00\x00\x04\xba\x00\x01\x00\x00\x00\x01\x00\x00\x6b\x43\
-\x00\x00\x02\x1e\x00\x00\x00\x00\x00\x01\x00\x00\x2b\xbf\
-\x00\x00\x00\xb0\x00\x00\x00\x00\x00\x01\x00\x00\x0e\x11\
-\x00\x00\x01\x80\x00\x00\x00\x00\x00\x01\x00\x00\x21\x2b\
-\x00\x00\x06\x00\x00\x00\x00\x00\x00\x01\x00\x00\x86\x22\
-\x00\x00\x00\x9a\x00\x00\x00\x00\x00\x01\x00\x00\x09\x71\
-\x00\x00\x04\x98\x00\x00\x00\x00\x00\x01\x00\x00\x68\x7e\
-\x00\x00\x06\x20\x00\x00\x00\x00\x00\x01\x00\x00\x8a\x99\
-\x00\x00\x04\x04\x00\x00\x00\x00\x00\x01\x00\x00\x5b\x84\
-\x00\x00\x01\x40\x00\x00\x00\x00\x00\x01\x00\x00\x1d\x4e\
-\x00\x00\x02\xc0\x00\x00\x00\x00\x00\x01\x00\x00\x36\xdb\
-\x00\x00\x05\x50\x00\x00\x00\x00\x00\x01\x00\x00\x78\x9c\
-\x00\x00\x04\xf6\x00\x00\x00\x00\x00\x01\x00\x00\x6f\x3f\
-\x00\x00\x03\x28\x00\x00\x00\x00\x00\x01\x00\x00\x44\x58\
-\x00\x00\x00\x74\x00\x00\x00\x00\x00\x01\x00\x00\x05\x6f\
+\x00\x00\x02\x88\x00\x00\x00\x00\x00\x01\x00\x00\x42\xaf\
+\x00\x00\x00\x5c\x00\x00\x00\x00\x00\x01\x00\x00\x09\xc1\
+\x00\x00\x03\xf6\x00\x00\x00\x00\x00\x01\x00\x00\x63\x37\
+\x00\x00\x03\x28\x00\x00\x00\x00\x00\x01\x00\x00\x53\x3a\
+\x00\x00\x01\x1e\x00\x00\x00\x00\x00\x01\x00\x00\x22\x3e\
+\x00\x00\x04\x58\x00\x01\x00\x00\x00\x01\x00\x00\x6a\xe7\
+\x00\x00\x05\x52\x00\x00\x00\x00\x00\x01\x00\x00\x7c\xa7\
+\x00\x00\x05\x3c\x00\x00\x00\x00\x00\x01\x00\x00\x78\x8c\
+\x00\x00\x00\xc4\x00\x00\x00\x00\x00\x01\x00\x00\x14\x80\
+\x00\x00\x00\xe8\x00\x00\x00\x00\x00\x01\x00\x00\x19\x27\
+\x00\x00\x01\x08\x00\x00\x00\x00\x00\x01\x00\x00\x1d\x9e\
+\x00\x00\x02\xc6\x00\x00\x00\x00\x00\x01\x00\x00\x4b\x3e\
+\x00\x00\x01\x72\x00\x00\x00\x00\x00\x01\x00\x00\x29\x8d\
\x00\x00\x00\x10\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\
-\x00\x00\x02\xf8\x00\x00\x00\x00\x00\x01\x00\x00\x3e\xd2\
-\x00\x00\x05\x84\x00\x00\x00\x00\x00\x01\x00\x00\x7b\xe8\
-\x00\x00\x04\xe0\x00\x01\x00\x00\x00\x01\x00\x00\x6d\x63\
-\x00\x00\x00\xc6\x00\x00\x00\x00\x00\x01\x00\x00\x12\x2c\
-\x00\x00\x03\x0e\x00\x00\x00\x00\x00\x01\x00\x00\x41\x6d\
-\x00\x00\x02\x88\x00\x00\x00\x00\x00\x01\x00\x00\x34\x65\
-\x00\x00\x05\x20\x00\x00\x00\x00\x00\x01\x00\x00\x71\xdb\
-\x00\x00\x05\x3a\x00\x00\x00\x00\x00\x01\x00\x00\x75\x39\
-\x00\x00\x01\xa4\x00\x00\x00\x00\x00\x01\x00\x00\x25\xd2\
-\x00\x00\x03\x8e\x00\x00\x00\x00\x00\x01\x00\x00\x4a\xb5\
-\x00\x00\x00\x4e\x00\x00\x00\x00\x00\x01\x00\x00\x02\xf4\
-\x00\x00\x02\x5e\x00\x00\x00\x00\x00\x01\x00\x00\x30\x0d\
-\x00\x00\x05\xe8\x00\x00\x00\x00\x00\x01\x00\x00\x82\x44\
-\x00\x00\x01\x18\x00\x00\x00\x00\x00\x01\x00\x00\x19\x28\
-\x00\x00\x04\x2a\x00\x00\x00\x00\x00\x01\x00\x00\x61\x43\
-\x00\x00\x02\x48\x00\x00\x00\x00\x00\x01\x00\x00\x2e\xed\
-\x00\x00\x02\xe4\x00\x00\x00\x00\x00\x01\x00\x00\x3a\xf2\
-\x00\x00\x03\x52\x00\x00\x00\x00\x00\x01\x00\x00\x47\x72\
-\x00\x00\x04\x7e\x00\x00\x00\x00\x00\x01\x00\x00\x67\x11\
-\x00\x00\x00\xea\x00\x00\x00\x00\x00\x01\x00\x00\x15\x6d\
-\x00\x00\x01\xee\x00\x00\x00\x00\x00\x01\x00\x00\x2b\x4f\
-\x00\x00\x06\x6e\x00\x00\x00\x00\x00\x01\x00\x00\x95\x07\
-\x00\x00\x03\xcc\x00\x00\x00\x00\x00\x01\x00\x00\x56\x6a\
+\x00\x00\x06\x3c\x00\x00\x00\x00\x00\x01\x00\x00\x90\x3c\
+\x00\x00\x05\x18\x00\x00\x00\x00\x00\x01\x00\x00\x74\x75\
+\x00\x00\x05\xa2\x00\x00\x00\x00\x00\x01\x00\x00\x82\x50\
+\x00\x00\x02\xe8\x00\x00\x00\x00\x00\x01\x00\x00\x4e\x03\
+\x00\x00\x03\x76\x00\x00\x00\x00\x00\x01\x00\x00\x59\x4b\
+\x00\x00\x00\x36\x00\x00\x00\x00\x00\x01\x00\x00\x05\xbf\
+\x00\x00\x03\xa0\x00\x00\x00\x00\x00\x01\x00\x00\x5c\x65\
+\x00\x00\x03\x12\x00\x00\x00\x00\x00\x01\x00\x00\x50\x9f\
+\x00\x00\x00\x9e\x00\x00\x00\x00\x00\x01\x00\x00\x12\x10\
+\x00\x00\x04\x28\x00\x01\x00\x00\x00\x01\x00\x00\x65\xad\
+\x00\x00\x05\xee\x00\x00\x00\x00\x00\x01\x00\x00\x88\xa3\
+\x00\x00\x01\xce\x00\x00\x00\x00\x00\x01\x00\x00\x32\x81\
+\x00\x00\x02\x18\x00\x00\x00\x00\x00\x01\x00\x00\x3b\x1f\
+\x00\x00\x04\x3e\x00\x00\x00\x00\x00\x01\x00\x00\x67\x89\
+\x00\x00\x01\x5c\x00\x00\x00\x00\x00\x01\x00\x00\x26\x2a\
+\x00\x00\x05\xd6\x00\x00\x00\x00\x00\x01\x00\x00\x85\x9c\
+\x00\x00\x02\x02\x00\x00\x00\x00\x00\x01\x00\x00\x36\xd9\
+\x00\x00\x05\x7c\x00\x00\x00\x00\x00\x01\x00\x00\x7f\xd5\
+\x00\x00\x06\x12\x00\x00\x00\x00\x00\x01\x00\x00\x8b\xe4\
+\x00\x00\x03\xde\x00\x00\x00\x00\x00\x01\x00\x00\x5f\x59\
+\x00\x00\x01\xa6\x00\x00\x00\x00\x00\x01\x00\x00\x2e\x5b\
+\x00\x00\x00\x76\x00\x00\x00\x00\x00\x01\x00\x00\x0f\x61\
+\x00\x00\x02\xb0\x00\x00\x00\x00\x00\x01\x00\x00\x4a\x1e\
+\x00\x00\x06\x7c\x00\x00\x00\x00\x00\x01\x00\x00\x94\x19\
+\x00\x00\x04\x7e\x00\x00\x00\x00\x00\x01\x00\x00\x6d\x07\
+\x00\x00\x01\xe8\x00\x00\x00\x00\x00\x01\x00\x00\x35\x6c\
+\x00\x00\x04\xba\x00\x00\x00\x00\x00\x01\x00\x00\x70\x4a\
+\x00\x00\x04\xe8\x00\x00\x00\x00\x00\x01\x00\x00\x74\x05\
+\x00\x00\x03\x54\x00\x00\x00\x00\x00\x01\x00\x00\x56\x59\
+\x00\x00\x02\x50\x00\x00\x00\x00\x00\x01\x00\x00\x3d\x95\
"
qt_resource_struct_v2 = b"\
@@ -2796,94 +2796,94 @@ qt_resource_struct_v2 = b"\
\x00\x00\x00\x00\x00\x00\x00\x00\
\x00\x00\x00\x00\x00\x02\x00\x00\x00\x2c\x00\x00\x00\x02\
\x00\x00\x00\x00\x00\x00\x00\x00\
-\x00\x00\x03\xa4\x00\x00\x00\x00\x00\x01\x00\x00\x4e\xfb\
-\x00\x00\x01\x86\x34\x85\x88\xf8\
-\x00\x00\x06\x54\x00\x00\x00\x00\x00\x01\x00\x00\x8f\x67\
-\x00\x00\x01\x86\x34\x85\x88\xf6\
-\x00\x00\x01\xbc\x00\x00\x00\x00\x00\x01\x00\x00\x28\xd9\
-\x00\x00\x01\x86\x34\x85\x88\xf4\
-\x00\x00\x04\x52\x00\x00\x00\x00\x00\x01\x00\x00\x63\xf2\
-\x00\x00\x01\x86\x34\x85\x88\xf6\
-\x00\x00\x05\xaa\x00\x00\x00\x00\x00\x01\x00\x00\x7e\x58\
-\x00\x00\x01\x86\x34\x85\x88\xf7\
-\x00\x00\x04\xba\x00\x01\x00\x00\x00\x01\x00\x00\x6b\x43\
-\x00\x00\x01\x86\x34\x85\x88\xf8\
-\x00\x00\x02\x1e\x00\x00\x00\x00\x00\x01\x00\x00\x2b\xbf\
-\x00\x00\x01\x86\x34\x85\x88\xf5\
-\x00\x00\x00\xb0\x00\x00\x00\x00\x00\x01\x00\x00\x0e\x11\
-\x00\x00\x01\x86\x34\x85\x88\xf9\
-\x00\x00\x01\x80\x00\x00\x00\x00\x00\x01\x00\x00\x21\x2b\
-\x00\x00\x01\x86\x34\x85\x88\xf7\
-\x00\x00\x06\x00\x00\x00\x00\x00\x00\x01\x00\x00\x86\x22\
-\x00\x00\x01\x86\x34\x85\x88\xf8\
-\x00\x00\x00\x9a\x00\x00\x00\x00\x00\x01\x00\x00\x09\x71\
-\x00\x00\x01\x86\x34\x85\x88\xf7\
-\x00\x00\x04\x98\x00\x00\x00\x00\x00\x01\x00\x00\x68\x7e\
-\x00\x00\x01\x86\x34\x85\x88\xf6\
-\x00\x00\x06\x20\x00\x00\x00\x00\x00\x01\x00\x00\x8a\x99\
-\x00\x00\x01\x86\x34\x85\x88\xf9\
-\x00\x00\x04\x04\x00\x00\x00\x00\x00\x01\x00\x00\x5b\x84\
-\x00\x00\x01\x86\x34\x85\x88\xf5\
-\x00\x00\x01\x40\x00\x00\x00\x00\x00\x01\x00\x00\x1d\x4e\
-\x00\x00\x01\x86\x34\x85\x88\xf7\
-\x00\x00\x02\xc0\x00\x00\x00\x00\x00\x01\x00\x00\x36\xdb\
-\x00\x00\x01\x86\x34\x85\x88\xf8\
-\x00\x00\x05\x50\x00\x00\x00\x00\x00\x01\x00\x00\x78\x9c\
-\x00\x00\x01\x86\x34\x85\x88\xf5\
-\x00\x00\x04\xf6\x00\x00\x00\x00\x00\x01\x00\x00\x6f\x3f\
-\x00\x00\x01\x86\x34\x85\x88\xf5\
-\x00\x00\x03\x28\x00\x00\x00\x00\x00\x01\x00\x00\x44\x58\
-\x00\x00\x01\x86\x34\x85\x88\xf5\
-\x00\x00\x00\x74\x00\x00\x00\x00\x00\x01\x00\x00\x05\x6f\
-\x00\x00\x01\x86\x34\x85\x88\xf6\
+\x00\x00\x02\x88\x00\x00\x00\x00\x00\x01\x00\x00\x42\xaf\
+\x00\x00\x01\x8d\xe7\xff\x00\x7d\
+\x00\x00\x00\x5c\x00\x00\x00\x00\x00\x01\x00\x00\x09\xc1\
+\x00\x00\x01\x8d\xe7\xff\x00\x7b\
+\x00\x00\x03\xf6\x00\x00\x00\x00\x00\x01\x00\x00\x63\x37\
+\x00\x00\x01\x8d\xe7\xff\x00\x7a\
+\x00\x00\x03\x28\x00\x00\x00\x00\x00\x01\x00\x00\x53\x3a\
+\x00\x00\x01\x8d\xe7\xff\x00\x7b\
+\x00\x00\x01\x1e\x00\x00\x00\x00\x00\x01\x00\x00\x22\x3e\
+\x00\x00\x01\x8d\xe7\xff\x00\x7c\
+\x00\x00\x04\x58\x00\x01\x00\x00\x00\x01\x00\x00\x6a\xe7\
+\x00\x00\x01\x8d\xe7\xff\x00\x7c\
+\x00\x00\x05\x52\x00\x00\x00\x00\x00\x01\x00\x00\x7c\xa7\
+\x00\x00\x01\x8d\xe7\xff\x00\x7a\
+\x00\x00\x05\x3c\x00\x00\x00\x00\x00\x01\x00\x00\x78\x8c\
+\x00\x00\x01\x8d\xe7\xff\x00\x7d\
+\x00\x00\x00\xc4\x00\x00\x00\x00\x00\x01\x00\x00\x14\x80\
+\x00\x00\x01\x8d\xe7\xff\x00\x7c\
+\x00\x00\x00\xe8\x00\x00\x00\x00\x00\x01\x00\x00\x19\x27\
+\x00\x00\x01\x8d\xe7\xff\x00\x7d\
+\x00\x00\x01\x08\x00\x00\x00\x00\x00\x01\x00\x00\x1d\x9e\
+\x00\x00\x01\x8d\xe7\xff\x00\x7c\
+\x00\x00\x02\xc6\x00\x00\x00\x00\x00\x01\x00\x00\x4b\x3e\
+\x00\x00\x01\x8d\xe7\xff\x00\x7b\
+\x00\x00\x01\x72\x00\x00\x00\x00\x00\x01\x00\x00\x29\x8d\
+\x00\x00\x01\x8d\xe7\xff\x00\x7d\
\x00\x00\x00\x10\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\
-\x00\x00\x01\x86\x34\x85\x88\xf5\
-\x00\x00\x02\xf8\x00\x00\x00\x00\x00\x01\x00\x00\x3e\xd2\
-\x00\x00\x01\x86\x34\x85\x88\xf8\
-\x00\x00\x05\x84\x00\x00\x00\x00\x00\x01\x00\x00\x7b\xe8\
-\x00\x00\x01\x86\x34\x85\x88\xf5\
-\x00\x00\x04\xe0\x00\x01\x00\x00\x00\x01\x00\x00\x6d\x63\
-\x00\x00\x01\x86\x34\x85\x88\xf8\
-\x00\x00\x00\xc6\x00\x00\x00\x00\x00\x01\x00\x00\x12\x2c\
-\x00\x00\x01\x86\x34\x85\x88\xf7\
-\x00\x00\x03\x0e\x00\x00\x00\x00\x00\x01\x00\x00\x41\x6d\
-\x00\x00\x01\x86\x34\x85\x88\xf7\
-\x00\x00\x02\x88\x00\x00\x00\x00\x00\x01\x00\x00\x34\x65\
-\x00\x00\x01\x86\x34\x85\x88\xf4\
-\x00\x00\x05\x20\x00\x00\x00\x00\x00\x01\x00\x00\x71\xdb\
-\x00\x00\x01\x86\x34\x85\x88\xf6\
-\x00\x00\x05\x3a\x00\x00\x00\x00\x00\x01\x00\x00\x75\x39\
-\x00\x00\x01\x86\x34\x85\x88\xf7\
-\x00\x00\x01\xa4\x00\x00\x00\x00\x00\x01\x00\x00\x25\xd2\
-\x00\x00\x01\x86\x34\x85\x88\xf7\
-\x00\x00\x03\x8e\x00\x00\x00\x00\x00\x01\x00\x00\x4a\xb5\
-\x00\x00\x01\x86\x34\x85\x88\xf8\
-\x00\x00\x00\x4e\x00\x00\x00\x00\x00\x01\x00\x00\x02\xf4\
-\x00\x00\x01\x86\x34\x85\x88\xf6\
-\x00\x00\x02\x5e\x00\x00\x00\x00\x00\x01\x00\x00\x30\x0d\
-\x00\x00\x01\x86\x34\x85\x88\xf5\
-\x00\x00\x05\xe8\x00\x00\x00\x00\x00\x01\x00\x00\x82\x44\
-\x00\x00\x01\x86\x34\x85\x88\xf6\
-\x00\x00\x01\x18\x00\x00\x00\x00\x00\x01\x00\x00\x19\x28\
-\x00\x00\x01\x86\x34\x85\x88\xf7\
-\x00\x00\x04\x2a\x00\x00\x00\x00\x00\x01\x00\x00\x61\x43\
-\x00\x00\x01\x86\x34\x85\x88\xf5\
-\x00\x00\x02\x48\x00\x00\x00\x00\x00\x01\x00\x00\x2e\xed\
-\x00\x00\x01\x86\x34\x85\x88\xf8\
-\x00\x00\x02\xe4\x00\x00\x00\x00\x00\x01\x00\x00\x3a\xf2\
-\x00\x00\x01\x86\x34\x85\x88\xf7\
-\x00\x00\x03\x52\x00\x00\x00\x00\x00\x01\x00\x00\x47\x72\
-\x00\x00\x01\x86\x34\x85\x88\xf6\
-\x00\x00\x04\x7e\x00\x00\x00\x00\x00\x01\x00\x00\x67\x11\
-\x00\x00\x01\x86\x34\x85\x88\xf4\
-\x00\x00\x00\xea\x00\x00\x00\x00\x00\x01\x00\x00\x15\x6d\
-\x00\x00\x01\x86\x34\x85\x88\xf8\
-\x00\x00\x01\xee\x00\x00\x00\x00\x00\x01\x00\x00\x2b\x4f\
-\x00\x00\x01\x86\x34\x85\x88\xf8\
-\x00\x00\x06\x6e\x00\x00\x00\x00\x00\x01\x00\x00\x95\x07\
-\x00\x00\x01\x86\x34\x85\x88\xf8\
-\x00\x00\x03\xcc\x00\x00\x00\x00\x00\x01\x00\x00\x56\x6a\
-\x00\x00\x01\x86\x34\x85\x88\xf5\
+\x00\x00\x01\x8d\xe7\xff\x00\x7b\
+\x00\x00\x06\x3c\x00\x00\x00\x00\x00\x01\x00\x00\x90\x3c\
+\x00\x00\x01\x8d\xe7\xff\x00\x7c\
+\x00\x00\x05\x18\x00\x00\x00\x00\x00\x01\x00\x00\x74\x75\
+\x00\x00\x01\x8d\xe7\xff\x00\x7d\
+\x00\x00\x05\xa2\x00\x00\x00\x00\x00\x01\x00\x00\x82\x50\
+\x00\x00\x01\x8d\xe7\xff\x00\x7b\
+\x00\x00\x02\xe8\x00\x00\x00\x00\x00\x01\x00\x00\x4e\x03\
+\x00\x00\x01\x8d\xe7\xff\x00\x7a\
+\x00\x00\x03\x76\x00\x00\x00\x00\x00\x01\x00\x00\x59\x4b\
+\x00\x00\x01\x8d\xe7\xff\x00\x7a\
+\x00\x00\x00\x36\x00\x00\x00\x00\x00\x01\x00\x00\x05\xbf\
+\x00\x00\x01\x8d\xe7\xff\x00\x7c\
+\x00\x00\x03\xa0\x00\x00\x00\x00\x00\x01\x00\x00\x5c\x65\
+\x00\x00\x01\x8d\xe7\xff\x00\x7b\
+\x00\x00\x03\x12\x00\x00\x00\x00\x00\x01\x00\x00\x50\x9f\
+\x00\x00\x01\x8d\xe7\xff\x00\x7d\
+\x00\x00\x00\x9e\x00\x00\x00\x00\x00\x01\x00\x00\x12\x10\
+\x00\x00\x01\x8d\xe7\xff\x00\x7a\
+\x00\x00\x04\x28\x00\x01\x00\x00\x00\x01\x00\x00\x65\xad\
+\x00\x00\x01\x8d\xe7\xff\x00\x7c\
+\x00\x00\x05\xee\x00\x00\x00\x00\x00\x01\x00\x00\x88\xa3\
+\x00\x00\x01\x8d\xe7\xff\x00\x7c\
+\x00\x00\x01\xce\x00\x00\x00\x00\x00\x01\x00\x00\x32\x81\
+\x00\x00\x01\x8d\xe7\xff\x00\x7c\
+\x00\x00\x02\x18\x00\x00\x00\x00\x00\x01\x00\x00\x3b\x1f\
+\x00\x00\x01\x8d\xe7\xff\x00\x7a\
+\x00\x00\x04\x3e\x00\x00\x00\x00\x00\x01\x00\x00\x67\x89\
+\x00\x00\x01\x8d\xe7\xff\x00\x7b\
+\x00\x00\x01\x5c\x00\x00\x00\x00\x00\x01\x00\x00\x26\x2a\
+\x00\x00\x01\x8d\xe7\xff\x00\x7c\
+\x00\x00\x05\xd6\x00\x00\x00\x00\x00\x01\x00\x00\x85\x9c\
+\x00\x00\x01\x8d\xe7\xff\x00\x7c\
+\x00\x00\x02\x02\x00\x00\x00\x00\x00\x01\x00\x00\x36\xd9\
+\x00\x00\x01\x8d\xe7\xff\x00\x7d\
+\x00\x00\x05\x7c\x00\x00\x00\x00\x00\x01\x00\x00\x7f\xd5\
+\x00\x00\x01\x8d\xe7\xff\x00\x7b\
+\x00\x00\x06\x12\x00\x00\x00\x00\x00\x01\x00\x00\x8b\xe4\
+\x00\x00\x01\x8d\xe7\xff\x00\x7b\
+\x00\x00\x03\xde\x00\x00\x00\x00\x00\x01\x00\x00\x5f\x59\
+\x00\x00\x01\x8d\xe7\xff\x00\x7b\
+\x00\x00\x01\xa6\x00\x00\x00\x00\x00\x01\x00\x00\x2e\x5b\
+\x00\x00\x01\x8d\xe7\xff\x00\x7c\
+\x00\x00\x00\x76\x00\x00\x00\x00\x00\x01\x00\x00\x0f\x61\
+\x00\x00\x01\x8d\xe7\xff\x00\x7a\
+\x00\x00\x02\xb0\x00\x00\x00\x00\x00\x01\x00\x00\x4a\x1e\
+\x00\x00\x01\x8d\xe7\xff\x00\x7d\
+\x00\x00\x06\x7c\x00\x00\x00\x00\x00\x01\x00\x00\x94\x19\
+\x00\x00\x01\x8d\xe7\xff\x00\x7c\
+\x00\x00\x04\x7e\x00\x00\x00\x00\x00\x01\x00\x00\x6d\x07\
+\x00\x00\x01\x8d\xe7\xff\x00\x7b\
+\x00\x00\x01\xe8\x00\x00\x00\x00\x00\x01\x00\x00\x35\x6c\
+\x00\x00\x01\x8d\xe7\xff\x00\x7a\
+\x00\x00\x04\xba\x00\x00\x00\x00\x00\x01\x00\x00\x70\x4a\
+\x00\x00\x01\x8d\xe7\xff\x00\x7d\
+\x00\x00\x04\xe8\x00\x00\x00\x00\x00\x01\x00\x00\x74\x05\
+\x00\x00\x01\x8d\xe7\xff\x00\x7d\
+\x00\x00\x03\x54\x00\x00\x00\x00\x00\x01\x00\x00\x56\x59\
+\x00\x00\x01\x8d\xe7\xff\x00\x7d\
+\x00\x00\x02\x50\x00\x00\x00\x00\x00\x01\x00\x00\x3d\x95\
+\x00\x00\x01\x8d\xe7\xff\x00\x7a\
"
qt_version = [int(v) for v in QtCore.qVersion().split('.')]
diff --git a/Build/source/utils/asymptote/GUI/pyUIClass/custMatTransform.py b/Build/source/utils/asymptote/GUI/pyUIClass/custMatTransform.py
index 8fa36cbc945..19e1e2e5877 100644
--- a/Build/source/utils/asymptote/GUI/pyUIClass/custMatTransform.py
+++ b/Build/source/utils/asymptote/GUI/pyUIClass/custMatTransform.py
@@ -2,7 +2,7 @@
# Form implementation generated from reading ui file 'GUI/windows/custMatTransform.ui'
#
-# Created by: PyQt5 UI code generator 5.15.6
+# Created by: PyQt5 UI code generator 5.15.9
#
# WARNING: Any manual changes made to this file will be lost when pyuic5 is
# run again. Do not edit this file unless you know what you are doing.
diff --git a/Build/source/utils/asymptote/GUI/pyUIClass/labelTextEditor.py b/Build/source/utils/asymptote/GUI/pyUIClass/labelTextEditor.py
index afbf7ea85b9..8b7016dadc0 100644
--- a/Build/source/utils/asymptote/GUI/pyUIClass/labelTextEditor.py
+++ b/Build/source/utils/asymptote/GUI/pyUIClass/labelTextEditor.py
@@ -2,7 +2,7 @@
# Form implementation generated from reading ui file 'GUI/windows/labelTextEditor.ui'
#
-# Created by: PyQt5 UI code generator 5.15.6
+# Created by: PyQt5 UI code generator 5.15.9
#
# WARNING: Any manual changes made to this file will be lost when pyuic5 is
# run again. Do not edit this file unless you know what you are doing.
diff --git a/Build/source/utils/asymptote/GUI/pyUIClass/setCustomAnchor.py b/Build/source/utils/asymptote/GUI/pyUIClass/setCustomAnchor.py
index 502f6573ab1..d513f96d8fd 100644
--- a/Build/source/utils/asymptote/GUI/pyUIClass/setCustomAnchor.py
+++ b/Build/source/utils/asymptote/GUI/pyUIClass/setCustomAnchor.py
@@ -2,7 +2,7 @@
# Form implementation generated from reading ui file 'GUI/windows/setCustomAnchor.ui'
#
-# Created by: PyQt5 UI code generator 5.15.6
+# Created by: PyQt5 UI code generator 5.15.9
#
# WARNING: Any manual changes made to this file will be lost when pyuic5 is
# run again. Do not edit this file unless you know what you are doing.
diff --git a/Build/source/utils/asymptote/GUI/pyUIClass/widg_addLabel.py b/Build/source/utils/asymptote/GUI/pyUIClass/widg_addLabel.py
index 2199d887d6d..df22e1c7edc 100644
--- a/Build/source/utils/asymptote/GUI/pyUIClass/widg_addLabel.py
+++ b/Build/source/utils/asymptote/GUI/pyUIClass/widg_addLabel.py
@@ -2,7 +2,7 @@
# Form implementation generated from reading ui file 'GUI/windows/widg_addLabel.ui'
#
-# Created by: PyQt5 UI code generator 5.15.6
+# Created by: PyQt5 UI code generator 5.15.9
#
# WARNING: Any manual changes made to this file will be lost when pyuic5 is
# run again. Do not edit this file unless you know what you are doing.
diff --git a/Build/source/utils/asymptote/GUI/pyUIClass/widg_addPolyOpt.py b/Build/source/utils/asymptote/GUI/pyUIClass/widg_addPolyOpt.py
index 2c58c5f2d16..c9ad76a8de8 100644
--- a/Build/source/utils/asymptote/GUI/pyUIClass/widg_addPolyOpt.py
+++ b/Build/source/utils/asymptote/GUI/pyUIClass/widg_addPolyOpt.py
@@ -2,7 +2,7 @@
# Form implementation generated from reading ui file 'GUI/windows/widg_addPolyOpt.ui'
#
-# Created by: PyQt5 UI code generator 5.15.6
+# Created by: PyQt5 UI code generator 5.15.9
#
# WARNING: Any manual changes made to this file will be lost when pyuic5 is
# run again. Do not edit this file unless you know what you are doing.
diff --git a/Build/source/utils/asymptote/GUI/pyUIClass/widg_editBezier.py b/Build/source/utils/asymptote/GUI/pyUIClass/widg_editBezier.py
index f4c5e5ba78b..ccad74fd01a 100644
--- a/Build/source/utils/asymptote/GUI/pyUIClass/widg_editBezier.py
+++ b/Build/source/utils/asymptote/GUI/pyUIClass/widg_editBezier.py
@@ -2,7 +2,7 @@
# Form implementation generated from reading ui file 'GUI/windows/widg_editBezier.ui'
#
-# Created by: PyQt5 UI code generator 5.15.6
+# Created by: PyQt5 UI code generator 5.15.9
#
# WARNING: Any manual changes made to this file will be lost when pyuic5 is
# run again. Do not edit this file unless you know what you are doing.
diff --git a/Build/source/utils/asymptote/GUI/pyUIClass/widgetPointEditor.py b/Build/source/utils/asymptote/GUI/pyUIClass/widgetPointEditor.py
index 53702920c05..b3f94b07fb4 100644
--- a/Build/source/utils/asymptote/GUI/pyUIClass/widgetPointEditor.py
+++ b/Build/source/utils/asymptote/GUI/pyUIClass/widgetPointEditor.py
@@ -2,7 +2,7 @@
# Form implementation generated from reading ui file 'GUI/windows/widgetPointEditor.ui'
#
-# Created by: PyQt5 UI code generator 5.15.6
+# Created by: PyQt5 UI code generator 5.15.9
#
# WARNING: Any manual changes made to this file will be lost when pyuic5 is
# run again. Do not edit this file unless you know what you are doing.
diff --git a/Build/source/utils/asymptote/GUI/pyUIClass/window1.py b/Build/source/utils/asymptote/GUI/pyUIClass/window1.py
index 457a67a6007..5887ebb2bf7 100644
--- a/Build/source/utils/asymptote/GUI/pyUIClass/window1.py
+++ b/Build/source/utils/asymptote/GUI/pyUIClass/window1.py
@@ -2,7 +2,7 @@
# Form implementation generated from reading ui file 'GUI/windows/window1.ui'
#
-# Created by: PyQt5 UI code generator 5.15.6
+# Created by: PyQt5 UI code generator 5.15.9
#
# WARNING: Any manual changes made to this file will be lost when pyuic5 is
# run again. Do not edit this file unless you know what you are doing.
diff --git a/Build/source/utils/asymptote/GUI/xasy2asy.py b/Build/source/utils/asymptote/GUI/xasy2asy.py
index 661426249d4..25c75b2ecf1 100755
--- a/Build/source/utils/asymptote/GUI/xasy2asy.py
+++ b/Build/source/utils/asymptote/GUI/xasy2asy.py
@@ -1166,9 +1166,8 @@ class xasyDrawnItem(xasyItem):
"""
Purpose:
--------
- A base class dedicated to any xasy item that is drawn on GUI. Every object of this class
- will correspond to a particular drawn xasy item on GUI, which contains all its particular
- data.
+ A base class dedicated to any xasy item that is drawn with the GUI.
+ Each object of this class corresponds to a particular drawn xasy item.
Attributes:
-----------
diff --git a/Build/source/utils/asymptote/LspCpp/CMakeLists.txt b/Build/source/utils/asymptote/LspCpp/CMakeLists.txt
index fe35bfcb8c4..b04e08e7335 100644
--- a/Build/source/utils/asymptote/LspCpp/CMakeLists.txt
+++ b/Build/source/utils/asymptote/LspCpp/CMakeLists.txt
@@ -38,10 +38,21 @@ option_if_not_defined(USE_SYSTEM_RAPIDJSON "Use system RapidJSON instead of the
option_if_not_defined(LSPCPP_WARNINGS_AS_ERRORS "Treat warnings as errors" OFF)
option_if_not_defined(LSPCPP_BUILD_EXAMPLES "Build example applications" OFF)
option_if_not_defined(LSPCPP_BUILD_FUZZER "Build fuzzer" OFF)
+option_if_not_defined(LSPCPP_BUILD_WEBSOCKETS "Build websocket server" ON)
option_if_not_defined(LSPCPP_ASAN "Build lsp with address sanitizer" OFF)
option_if_not_defined(LSPCPP_MSAN "Build lsp with memory sanitizer" OFF)
option_if_not_defined(LSPCPP_TSAN "Build lsp with thread sanitizer" OFF)
option_if_not_defined(LSPCPP_INSTALL "Create lsp install target" OFF)
+option_if_not_defined(LSPCPP_SUPPORT_BOEHM_GC
+ "Enable support for Boehm GC. Boehm GC must be available by find_package(BDWgc CONFIG REQUIRED)." OFF)
+option_if_not_defined(LSPCPP_USE_CPP17 "Use C++17 for compilation. Setting this to off requires boost-optional." OFF)
+
+
+# Boehm GC
+
+if (LSPCPP_SUPPORT_BOEHM_GC)
+ find_package(BDWgc CONFIG REQUIRED)
+endif()
###########################################################
# Directories
@@ -88,8 +99,12 @@ function(lspcpp_set_target_options target)
set_property(TARGET ${target} PROPERTY CXX_STANDARD_REQUIRED ON)
- # Enable C++14 (Required)
- set_property(TARGET ${target} PROPERTY CXX_STANDARD 14)
+ # Enable C++14/17 (Required)
+ if (LSPCPP_USE_CPP17)
+ set_property(TARGET ${target} PROPERTY CXX_STANDARD 17)
+ else()
+ set_property(TARGET ${target} PROPERTY CXX_STANDARD 14)
+ endif()
set_property(TARGET ${target} PROPERTY CXX_EXTENSIONS OFF)
@@ -151,6 +166,11 @@ function(lspcpp_set_target_options target)
# target_compile_options(${target} PRIVATE "-Wl,--no-undefined")
# endif()
+ if (LSPCPP_SUPPORT_BOEHM_GC)
+ target_link_libraries(${target} PUBLIC BDWgc::gc)
+ target_compile_definitions(${target} PUBLIC LSPCPP_USEGC)
+ endif()
+
endfunction()
@@ -241,7 +261,7 @@ foreach(include_dir ${LSPCPP_THIRD_PARTY_DIR_LIST})
endforeach()
### Sources
-set(LSPCPP_LIST
+set(JSONRPC_LIST
src/jsonrpc/Context.cpp
src/jsonrpc/Endpoint.cpp
src/jsonrpc/GCThreadContext.cpp
@@ -252,8 +272,8 @@ set(LSPCPP_LIST
src/jsonrpc/StreamMessageProducer.cpp
src/jsonrpc/TcpServer.cpp
src/jsonrpc/threaded_queue.cpp
- src/jsonrpc/WebSocketServer.cpp
-
+)
+set(LSPCPP_LIST
src/lsp/initialize.cpp
src/lsp/lsp.cpp
src/lsp/lsp_diagnostic.cpp
@@ -265,7 +285,15 @@ set(LSPCPP_LIST
src/lsp/working_files.cpp
)
+if(LSPCPP_BUILD_WEBSOCKETS)
+ set(JSONRPC_LIST
+ ${JSONRPC_LIST}
+ src/jsonrpc/WebSocketServer.cpp
+ )
+endif()
+
target_sources(lspcpp PRIVATE
+ ${JSONRPC_LIST}
${LSPCPP_LIST})
### Compile options
diff --git a/Build/source/utils/asymptote/LspCpp/examples/StdIOClientExample.cpp b/Build/source/utils/asymptote/LspCpp/examples/StdIOClientExample.cpp
index 1c759749123..13bf9da6334 100755
--- a/Build/source/utils/asymptote/LspCpp/examples/StdIOClientExample.cpp
+++ b/Build/source/utils/asymptote/LspCpp/examples/StdIOClientExample.cpp
@@ -22,6 +22,7 @@
#include <boost/asio.hpp>
#include <iostream>
+#include <thread>
using namespace boost::asio::ip;
using namespace std;
@@ -162,7 +163,7 @@ int main(int argc, char* argv[])
}
else
{
- execPath = "STDIO_SERVER_EXAMPLE.exe";
+ execPath = "StdIOServerExample";
}
Client client(execPath, {});
diff --git a/Build/source/utils/asymptote/LspCpp/examples/StdIOServerExample.cpp b/Build/source/utils/asymptote/LspCpp/examples/StdIOServerExample.cpp
index 028283ab8db..8b2d2b2d29e 100755
--- a/Build/source/utils/asymptote/LspCpp/examples/StdIOServerExample.cpp
+++ b/Build/source/utils/asymptote/LspCpp/examples/StdIOServerExample.cpp
@@ -20,6 +20,8 @@
#include <boost/filesystem.hpp>
#include <boost/asio.hpp>
#include <iostream>
+#include <thread>
+
using namespace boost::asio::ip;
using namespace std;
class DummyLog :public lsp::Log
diff --git a/Build/source/utils/asymptote/LspCpp/examples/TcpServerExample.cpp b/Build/source/utils/asymptote/LspCpp/examples/TcpServerExample.cpp
index 42ed73407ed..37a4266c94f 100755
--- a/Build/source/utils/asymptote/LspCpp/examples/TcpServerExample.cpp
+++ b/Build/source/utils/asymptote/LspCpp/examples/TcpServerExample.cpp
@@ -19,6 +19,8 @@
#include <boost/filesystem.hpp>
#include <boost/asio.hpp>
#include <iostream>
+#include <thread>
+
using namespace boost::asio::ip;
using namespace std;
class DummyLog :public lsp::Log
diff --git a/Build/source/utils/asymptote/LspCpp/include/LibLsp/JsonRpc/GCThreadContext.h b/Build/source/utils/asymptote/LspCpp/include/LibLsp/JsonRpc/GCThreadContext.h
index a0f7db288d4..6c9f9c1cbb3 100644
--- a/Build/source/utils/asymptote/LspCpp/include/LibLsp/JsonRpc/GCThreadContext.h
+++ b/Build/source/utils/asymptote/LspCpp/include/LibLsp/JsonRpc/GCThreadContext.h
@@ -1,6 +1,6 @@
#pragma once
-#if defined(USEGC)
+#if defined(LSPCPP_USEGC)
#define GC_THREADS
#include <gc.h>
#endif
@@ -12,7 +12,7 @@ public:
~GCThreadContext();
private:
-#if defined(USEGC)
+#if defined(LSPCPP_USEGC)
GC_stack_base gsb;
#endif
diff --git a/Build/source/utils/asymptote/LspCpp/include/LibLsp/JsonRpc/MessageProducer.h b/Build/source/utils/asymptote/LspCpp/include/LibLsp/JsonRpc/MessageProducer.h
index 2affe3b3ff2..4f3799555ab 100644
--- a/Build/source/utils/asymptote/LspCpp/include/LibLsp/JsonRpc/MessageProducer.h
+++ b/Build/source/utils/asymptote/LspCpp/include/LibLsp/JsonRpc/MessageProducer.h
@@ -2,11 +2,18 @@
#include <string>
#include <functional>
+namespace lsp {
+ /// The encoding style of the JSON-RPC messages (both input and output).
+ enum JSONStreamStyle {
+ /// Encoding per the LSP specification, with mandatory Content-Length header.
+ Standard,
+ /// Messages are delimited by a '// -----' line. Comment lines start with //.
+ Delimited
+ };
+}
class MessageProducer
{
public:
-
-
typedef std::function< void(std::string&&) > MessageConsumer;
virtual ~MessageProducer() = default;
virtual void listen(MessageConsumer) = 0;
diff --git a/Build/source/utils/asymptote/LspCpp/include/LibLsp/JsonRpc/RemoteEndPoint.h b/Build/source/utils/asymptote/LspCpp/include/LibLsp/JsonRpc/RemoteEndPoint.h
index 4045098f1bf..8d013bd889f 100644
--- a/Build/source/utils/asymptote/LspCpp/include/LibLsp/JsonRpc/RemoteEndPoint.h
+++ b/Build/source/utils/asymptote/LspCpp/include/LibLsp/JsonRpc/RemoteEndPoint.h
@@ -13,6 +13,7 @@
#include "LibLsp/JsonRpc/MessageJsonHandler.h"
#include "Endpoint.h"
#include "future.h"
+#include "MessageProducer.h"
class MessageJsonHandler;
@@ -125,7 +126,9 @@ public:
RemoteEndPoint(const std::shared_ptr <MessageJsonHandler>& json_handler,
const std::shared_ptr < Endpoint >& localEndPoint,
- lsp::Log& _log, uint8_t max_workers = 2);
+ lsp::Log& _log,
+ lsp::JSONStreamStyle style = lsp::JSONStreamStyle::Standard,
+ uint8_t max_workers = 2);
~RemoteEndPoint() override;
template <typename F, typename RequestType = ParamType<F, 0>, typename ResponseType = typename RequestType::Response>
diff --git a/Build/source/utils/asymptote/LspCpp/include/LibLsp/JsonRpc/StreamMessageProducer.h b/Build/source/utils/asymptote/LspCpp/include/LibLsp/JsonRpc/StreamMessageProducer.h
index e039891f5f9..9cd6aef37f3 100644
--- a/Build/source/utils/asymptote/LspCpp/include/LibLsp/JsonRpc/StreamMessageProducer.h
+++ b/Build/source/utils/asymptote/LspCpp/include/LibLsp/JsonRpc/StreamMessageProducer.h
@@ -13,36 +13,79 @@ namespace lsp {
class StreamMessageProducer : public MessageProducer
{
public:
- struct Headers
- {
- int contentLength = -1;
- std::string charset;
- void clear()
- {
- contentLength = -1;
- charset.clear();
- }
- };
- bool handleMessage(Headers& headers, MessageConsumer callBack);
- StreamMessageProducer(
+
+ StreamMessageProducer(
MessageIssueHandler& message_issue_handler, std::shared_ptr < lsp::istream> _input)
: issueHandler(message_issue_handler),
input(_input)
{
}
- StreamMessageProducer(
+ StreamMessageProducer(
MessageIssueHandler& message_issue_handler)
: issueHandler(message_issue_handler)
{
}
bool keepRunning = false;
- void listen(MessageConsumer) override;
- void bind(std::shared_ptr < lsp::istream>);
- void parseHeader(std::string& line, Headers& headers);
-private:
+
+ virtual void bind(std::shared_ptr<lsp::istream>) = 0 ;
+
+protected:
MessageIssueHandler& issueHandler;
std::shared_ptr < lsp::istream> input;
+
+};
+
+class LSPStreamMessageProducer : public StreamMessageProducer
+{
+public:
+ struct Headers
+ {
+ int contentLength = -1;
+ std::string charset;
+ void clear()
+ {
+ contentLength = -1;
+ charset.clear();
+ }
+ };
+ bool handleMessage(Headers& headers, MessageConsumer callBack);
+
+ LSPStreamMessageProducer(
+ MessageIssueHandler& message_issue_handler, std::shared_ptr < lsp::istream> _input)
+ : StreamMessageProducer(message_issue_handler,_input)
+ {
+ }
+ LSPStreamMessageProducer(
+ MessageIssueHandler& message_issue_handler)
+ : StreamMessageProducer(message_issue_handler)
+ {
+ }
+
+
+ void listen(MessageConsumer) override;
+ void bind(std::shared_ptr<lsp::istream>) override;
+ void parseHeader(std::string& line, Headers& headers);
};
+class DelimitedStreamMessageProducer : public StreamMessageProducer
+{
+public:
+
+ DelimitedStreamMessageProducer(
+ MessageIssueHandler& message_issue_handler, std::shared_ptr <lsp::istream> _input)
+ : StreamMessageProducer(message_issue_handler,_input)
+ {
+ }
+ DelimitedStreamMessageProducer(
+ MessageIssueHandler& message_issue_handler)
+ : StreamMessageProducer(message_issue_handler)
+ {
+ }
+
+
+ void listen(MessageConsumer) override;
+ void bind(std::shared_ptr < lsp::istream>) override;
+
+}; \ No newline at end of file
diff --git a/Build/source/utils/asymptote/LspCpp/include/LibLsp/JsonRpc/optionalVersion.h b/Build/source/utils/asymptote/LspCpp/include/LibLsp/JsonRpc/optionalVersion.h
new file mode 100644
index 00000000000..f767b18f909
--- /dev/null
+++ b/Build/source/utils/asymptote/LspCpp/include/LibLsp/JsonRpc/optionalVersion.h
@@ -0,0 +1,13 @@
+#ifndef boost
+#if __cplusplus < 201703L
+
+#include <boost/optional.hpp>
+using boost::optional;
+
+#else
+
+#include <optional>
+using std::optional;
+
+#endif
+#endif
diff --git a/Build/source/utils/asymptote/LspCpp/include/LibLsp/JsonRpc/serializer.h b/Build/source/utils/asymptote/LspCpp/include/LibLsp/JsonRpc/serializer.h
index 477c8228451..1763c84f5f7 100644
--- a/Build/source/utils/asymptote/LspCpp/include/LibLsp/JsonRpc/serializer.h
+++ b/Build/source/utils/asymptote/LspCpp/include/LibLsp/JsonRpc/serializer.h
@@ -1,11 +1,6 @@
#pragma once
#include "macro_map.h"
-#ifdef boost
-#include "optional.hpp"
-#else
-#include <boost/optional.hpp>
-#endif
#include <cassert>
#include <memory>
@@ -16,6 +11,7 @@
#include <map>
#include <algorithm>
+#include "optionalVersion.h"
struct AbsolutePath;
@@ -205,9 +201,8 @@ void Reflect(Reader& visitor, SerializeFormat& value);
void Reflect(Writer& visitor, SerializeFormat& value);
//// Type constructors
-
template <typename T>
-void Reflect(Reader& visitor, boost::optional<T>& value) {
+void Reflect(Reader& visitor, optional<T>& value) {
if (visitor.IsNull()) {
visitor.GetNull();
return;
@@ -217,7 +212,7 @@ void Reflect(Reader& visitor, boost::optional<T>& value) {
value = std::move(real_value);
}
template <typename T>
-void Reflect(Writer& visitor, boost::optional<T>& value) {
+void Reflect(Writer& visitor, optional<T>& value) {
if (value)
Reflect(visitor, *value);
else
@@ -226,7 +221,7 @@ void Reflect(Writer& visitor, boost::optional<T>& value) {
template <typename T>
-void ReflectMember(Writer& visitor, const char* name, boost::optional<T>& value) {
+void ReflectMember(Writer& visitor, const char* name, optional<T>& value) {
// For TypeScript optional property key?: value in the spec,
// We omit both key and value if value is std::nullopt (null) for JsonWriter
// to reduce output. But keep it for other serialization formats.
@@ -237,7 +232,6 @@ void ReflectMember(Writer& visitor, const char* name, boost::optional<T>& value)
}
-
template <typename T>
void ReflectMember(Writer& visitor,
const char* name,
@@ -329,7 +323,7 @@ void ReflectMember(Writer& visitor, const char* name, T& value) {
}
template<class _Ty1, class _Ty2>
-void Reflect(Writer& visitor, std::pair< boost::optional<_Ty1>, boost::optional<_Ty2> >& value)
+void Reflect(Writer& visitor, std::pair< optional<_Ty1>, optional<_Ty2> >& value)
{
if (value.first)
{
@@ -341,7 +335,7 @@ void Reflect(Writer& visitor, std::pair< boost::optional<_Ty1>, boost::optional
}
}
template<class _Ty2>
-void Reflect(Reader& visitor, std::pair< boost::optional<bool>, boost::optional<_Ty2> >& value)
+void Reflect(Reader& visitor, std::pair< optional<bool>, optional<_Ty2> >& value)
{
if(visitor.IsBool())
{
@@ -352,7 +346,7 @@ void Reflect(Reader& visitor, std::pair< boost::optional<bool>, boost::optional
Reflect(visitor, value.second);
}
template<class _Ty2>
-void Reflect(Reader& visitor, std::pair< boost::optional<std::string>, boost::optional<_Ty2> >& value)
+void Reflect(Reader& visitor, std::pair< optional<std::string>, optional<_Ty2> >& value)
{
if (visitor.IsString())
{
@@ -365,7 +359,7 @@ void Reflect(Reader& visitor, std::pair< boost::optional<std::string>, boost::o
template<class _Ty1, class _Ty2>
-void Reflect(Reader& visitor, std::pair< boost::optional<_Ty1>, boost::optional<_Ty2> >& value)
+void Reflect(Reader& visitor, std::pair< optional<_Ty1>, optional<_Ty2> >& value)
{
try
{
diff --git a/Build/source/utils/asymptote/LspCpp/include/LibLsp/JsonRpc/threaded_queue.h b/Build/source/utils/asymptote/LspCpp/include/LibLsp/JsonRpc/threaded_queue.h
index 3e1ba547ca0..e8fc6d13eaf 100644
--- a/Build/source/utils/asymptote/LspCpp/include/LibLsp/JsonRpc/threaded_queue.h
+++ b/Build/source/utils/asymptote/LspCpp/include/LibLsp/JsonRpc/threaded_queue.h
@@ -1,6 +1,6 @@
#pragma once
-#include <boost/optional/optional.hpp>
+#include <optional>
#include <algorithm>
#include <atomic>
#include <condition_variable>
@@ -11,6 +11,7 @@
#include <utility>
#include <vector>
+#include "optionalVersion.h"
struct MultiQueueWaiter;
@@ -156,7 +157,7 @@ struct ThreadedQueue : public BaseThreadQueue {
// Get the first element from the queue without blocking. Returns a null
// value if the queue is empty.
- boost::optional<T> TryDequeue(bool priority) {
+ optional<T> TryDequeue(bool priority) {
std::lock_guard<std::mutex> lock(mutex);
auto pop = [&](std::deque<T>* q) {
@@ -167,7 +168,7 @@ struct ThreadedQueue : public BaseThreadQueue {
};
auto get_result = [&](std::deque<T>* first,
- std::deque<T>* second) -> boost::optional<T> {
+ std::deque<T>* second) -> optional<T> {
if (!first->empty())
return pop(first);
if (!second->empty())
diff --git a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/ClientPreferences.h b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/ClientPreferences.h
index 29ab82b1c6b..26afc484b64 100644
--- a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/ClientPreferences.h
+++ b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/ClientPreferences.h
@@ -79,14 +79,14 @@ public:
return v3supported && isDynamicRegistrationSupported(textDocument.signatureHelp);
}
template<typename T>
- static bool isDynamicRegistrationSupported(boost::optional<T>& capability)
+ static bool isDynamicRegistrationSupported(optional<T>& capability)
{
if(capability)
return (capability.value().dynamicRegistration.value());
return false;
}
- bool isTrue(const boost::optional<bool>& value)
+ bool isTrue(const optional<bool>& value)
{
return value.get_value_or(false);
}
@@ -282,8 +282,8 @@ public:
return false;
}
- bool isTagSupported(const boost::optional < std::pair<boost::optional<bool>,
- boost::optional<DiagnosticsTagSupport> > >& tagSupport) {
+ bool isTagSupported(const optional < std::pair<optional<bool>,
+ optional<DiagnosticsTagSupport> > >& tagSupport) {
if(tagSupport)
{
auto &v = tagSupport.value();
diff --git a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/CodeActionParams.h b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/CodeActionParams.h
index 1704dd33c6c..6c30ce82dac 100644
--- a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/CodeActionParams.h
+++ b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/CodeActionParams.h
@@ -77,7 +77,7 @@ struct lsCodeActionContext {
*
* See {@link CodeActionKind} for allowed values.
*/
- boost::optional<std::vector<std::string>> only;
+ optional<std::vector<std::string>> only;
MAKE_SWAP_METHOD(lsCodeActionContext,
diagnostics, only);
diff --git a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/ExecuteCommandParams.h b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/ExecuteCommandParams.h
index 5ad4e07d8d4..bb73d8a46f5 100644
--- a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/ExecuteCommandParams.h
+++ b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/ExecuteCommandParams.h
@@ -13,7 +13,7 @@ struct ExecuteCommandParams {
* The arguments are typically specified when a command is returned from the server to the client.
* Example requests that return a command are textDocument/codeAction or textDocument/codeLens.
*/
- boost::optional<std::vector<lsp::Any>> arguments;
+ optional<std::vector<lsp::Any>> arguments;
MAKE_SWAP_METHOD(ExecuteCommandParams, command, arguments);
};
diff --git a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/ResourceOperation.h b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/ResourceOperation.h
index ea602059005..3d317a81532 100644
--- a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/ResourceOperation.h
+++ b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/ResourceOperation.h
@@ -18,12 +18,12 @@ struct CreateFileOptions{
/**
* Overwrite existing file. Overwrite wins over `ignoreIfExists`
*/
- boost::optional<bool> overwrite = false;
+ optional<bool> overwrite = false;
/**
* Ignore if exists.
*/
- boost::optional< bool> ignoreIfExists =false;
+ optional< bool> ignoreIfExists =false;
MAKE_SWAP_METHOD(CreateFileOptions, overwrite, ignoreIfExists)
};
@@ -39,7 +39,7 @@ struct lsCreateFile :public ResourceOperation {
/**
* Additional options
*/
- boost::optional<CreateFileOptions> options;
+ optional<CreateFileOptions> options;
/**
@@ -47,7 +47,7 @@ struct lsCreateFile :public ResourceOperation {
*
* @since 3.16.0
*/
- boost::optional<lsChangeAnnotationIdentifier> annotationId;
+ optional<lsChangeAnnotationIdentifier> annotationId;
MAKE_SWAP_METHOD(lsCreateFile, kind, uri, options, annotationId)
};
@@ -58,12 +58,12 @@ struct DeleteFileOptions {
/**
* Delete the content recursively if a folder is denoted.
*/
- boost::optional<bool> recursive = false;
+ optional<bool> recursive = false;
/**
* Ignore the operation if the file doesn't exist.
*/
- boost::optional<bool> ignoreIfNotExists = false;
+ optional<bool> ignoreIfNotExists = false;
MAKE_SWAP_METHOD(DeleteFileOptions, recursive, ignoreIfNotExists);
@@ -81,7 +81,7 @@ struct lsDeleteFile :public ResourceOperation {
/**
* Delete options.
*/
- boost::optional<DeleteFileOptions> options;
+ optional<DeleteFileOptions> options;
MAKE_SWAP_METHOD(lsDeleteFile, kind, uri, options);
};
@@ -104,14 +104,14 @@ struct lsRenameFile :public ResourceOperation {
/**
* Rename options.
*/
- boost::optional<RenameFileOptions> options;
+ optional<RenameFileOptions> options;
/**
* An optional annotation identifer describing the operation.
*
* @since 3.16.0
*/
- boost::optional<lsChangeAnnotationIdentifier> annotationId;
+ optional<lsChangeAnnotationIdentifier> annotationId;
MAKE_SWAP_METHOD(lsRenameFile, kind, oldUri, newUri, options, annotationId)
};
diff --git a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/extention/jdtls/getMoveDestinations.h b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/extention/jdtls/getMoveDestinations.h
index 56f09a0a537..8fbe2caa8d1 100644
--- a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/extention/jdtls/getMoveDestinations.h
+++ b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/extention/jdtls/getMoveDestinations.h
@@ -35,7 +35,7 @@ struct MoveParams {
/**
* The code action params when the move operation is triggered.
*/
- boost::optional<lsCodeActionParams> params;
+ optional<lsCodeActionParams> params;
/**
* The possible destination: a folder/package, class, instanceDeclaration.
*/
diff --git a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/extention/jdtls/getRefactorEdit.h b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/extention/jdtls/getRefactorEdit.h
index 131612dc2e3..23549ecbccd 100644
--- a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/extention/jdtls/getRefactorEdit.h
+++ b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/extention/jdtls/getRefactorEdit.h
@@ -47,7 +47,7 @@ struct GetRefactorEditParams
std::string command;
std::vector<lsp::Any> commandArguments;
lsCodeActionParams context;
- boost::optional<lsFormattingOptions> options;
+ optional<lsFormattingOptions> options;
MAKE_SWAP_METHOD(GetRefactorEditParams, command, context, options);
};
MAKE_REFLECT_STRUCT(GetRefactorEditParams, command, context, options);
@@ -65,9 +65,9 @@ struct RefactorWorkspaceEdit {
* command, first the edit is executed and then the command.
*/
- boost::optional<std::string> errorMessage;
+ optional<std::string> errorMessage;
- boost::optional < lsCommandWithAny > command;
+ optional < lsCommandWithAny > command;
MAKE_SWAP_METHOD(RefactorWorkspaceEdit, edit, command, errorMessage)
};
diff --git a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/extention/jdtls/searchSymbols.h b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/extention/jdtls/searchSymbols.h
index 18a2f9999e5..6639ad2cf44 100644
--- a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/extention/jdtls/searchSymbols.h
+++ b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/extention/jdtls/searchSymbols.h
@@ -13,9 +13,9 @@
struct SearchSymbolParams :public WorkspaceSymbolParams
{
- boost::optional<std::string> projectName;
- boost::optional< bool >sourceOnly;
- boost::optional< int> maxResults;
+ optional<std::string> projectName;
+ optional< bool >sourceOnly;
+ optional< int> maxResults;
MAKE_SWAP_METHOD(SearchSymbolParams, query, projectName, sourceOnly, maxResults);
};
MAKE_REFLECT_STRUCT(SearchSymbolParams, query, projectName, sourceOnly, maxResults);
diff --git a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/extention/sonarlint/protocol.h b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/extention/sonarlint/protocol.h
index 0823469ba90..6752c408120 100644
--- a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/extention/sonarlint/protocol.h
+++ b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/extention/sonarlint/protocol.h
@@ -1,6 +1,6 @@
#pragma once
#include <string>
-#include <boost/optional.hpp>
+#include <optional>
#include "LibLsp/JsonRpc/RequestInMessage.h"
#include "LibLsp/lsp/lsDocumentUri.h"
#include "LibLsp/lsp/lsAny.h"
@@ -18,8 +18,8 @@ struct LintRule
return name + " (" + key + ")";
}
bool activeByDefault = true;
- boost::optional<std::string> severity;
- boost::optional<std::string> type;
+ optional<std::string> severity;
+ optional<std::string> type;
int icon_index = -1;
MAKE_SWAP_METHOD(LintRule, key, name, activeByDefault, severity, type);
@@ -29,25 +29,25 @@ MAKE_REFLECT_STRUCT(LintRule, key, name, activeByDefault, severity, type);
struct RuleParameter {
std::string name;
- boost::optional<std::string> description;
- boost::optional<std::string> defaultValue;
+ optional<std::string> description;
+ optional<std::string> defaultValue;
};
MAKE_REFLECT_STRUCT(RuleParameter, name, description, defaultValue);
struct ShowRuleDescriptionParams {
- boost::optional<std::string> key;
+ optional<std::string> key;
- boost::optional<std::string> name;
+ optional<std::string> name;
- boost::optional<std::string> htmlDescription;
+ optional<std::string> htmlDescription;
- boost::optional<std::string> type;
+ optional<std::string> type;
- boost::optional<std::string> severity;
+ optional<std::string> severity;
- boost::optional< std::vector<RuleParameter> > parameters;
+ optional< std::vector<RuleParameter> > parameters;
MAKE_SWAP_METHOD(ShowRuleDescriptionParams, key, name, htmlDescription, type, severity, parameters)
@@ -82,7 +82,7 @@ struct ServerConnectionSettings {
std::string connectionId;
std::string serverUrl;
std::string token;
- boost::optional<std::string> organizationKey;
+ optional<std::string> organizationKey;
MAKE_SWAP_METHOD(ServerConnectionSettings, connectionId, serverUrl, token, organizationKey)
};
@@ -114,28 +114,28 @@ struct RuleSetting
off();
}
}
- boost::optional< std::map<std::string, std::string > > parameters;
+ optional< std::map<std::string, std::string > > parameters;
};
MAKE_REFLECT_STRUCT(RuleSetting, level, parameters)
struct ConsoleParams
{
- boost::optional < bool >showAnalyzerLogs;
- boost::optional < bool >showVerboseLogs;
+ optional < bool >showAnalyzerLogs;
+ optional < bool >showVerboseLogs;
MAKE_SWAP_METHOD(ConsoleParams, showAnalyzerLogs, showVerboseLogs)
};
MAKE_REFLECT_STRUCT(ConsoleParams, showAnalyzerLogs, showVerboseLogs)
struct SonarLintWorkspaceSettings
{
- boost::optional < bool > disableTelemetry;
- boost::optional < std::map<std::string, ServerConnectionSettings> >connectedMode;
- boost::optional<std::map<std::string, RuleSetting>> rules;
- boost::optional<ConsoleParams> output;
+ optional < bool > disableTelemetry;
+ optional < std::map<std::string, ServerConnectionSettings> >connectedMode;
+ optional<std::map<std::string, RuleSetting>> rules;
+ optional<ConsoleParams> output;
- boost::optional<std::string > pathToNodeExecutable;
+ optional<std::string > pathToNodeExecutable;
- boost::optional< std::map<std::string, std::string > > getConfigurationParameters(const std::string& ruleKey);
+ optional< std::map<std::string, std::string > > getConfigurationParameters(const std::string& ruleKey);
};
diff --git a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/general/InitializeParams.h b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/general/InitializeParams.h
index c07cc8149d6..145c63087f0 100644
--- a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/general/InitializeParams.h
+++ b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/general/InitializeParams.h
@@ -7,7 +7,7 @@
struct ClientInfo {
std::string name;
- boost::optional<std::string> version;
+ optional<std::string> version;
MAKE_SWAP_METHOD(ClientInfo,name,version);
};
@@ -18,14 +18,14 @@ struct lsInitializeParams {
// the server. Is null if the process has not been started by another process.
// If the parent process is not alive then the server should exit (see exit
// notification) its process.
- boost::optional<int> processId;
+ optional<int> processId;
/**
* Information about the client
*
* @since 3.15.0
*/
- boost::optional<ClientInfo> clientInfo;
+ optional<ClientInfo> clientInfo;
/**
* The locale the client is currently showing the user interface
* in. This must not necessarily be the locale of the operating
@@ -36,32 +36,32 @@ struct lsInitializeParams {
*
* @since 3.16.0
*/
- boost::optional<std::string> locale;
+ optional<std::string> locale;
// The rootPath of the workspace. Is null
// if no folder is open.
//
// @deprecated in favour of rootUri.
- boost::optional<std::string> rootPath;
+ optional<std::string> rootPath;
// The rootUri of the workspace. Is null if no
// folder is open. If both `rootPath` and `rootUri` are set
// `rootUri` wins.
- boost::optional<lsDocumentUri> rootUri;
+ optional<lsDocumentUri> rootUri;
// User provided initialization options.
- boost::optional<lsp::Any> initializationOptions;
+ optional<lsp::Any> initializationOptions;
// The capabilities provided by the client (editor or tool)
lsClientCapabilities capabilities;
/**
- * An boost::optional extension to the protocol.
+ * An optional extension to the protocol.
* To tell the server what client (editor) is talking to it.
*/
// @Deprecated
- boost::optional< std::string >clientName;
+ optional< std::string >clientName;
@@ -85,7 +85,7 @@ struct lsInitializeParams {
*
* Since 3.6.0
*/
- boost::optional< std::vector<WorkspaceFolder> > workspaceFolders;
+ optional< std::vector<WorkspaceFolder> > workspaceFolders;
MAKE_SWAP_METHOD(lsInitializeParams,
processId,
diff --git a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/general/exit.h b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/general/exit.h
index 02fe2160173..bef9cad31df 100644
--- a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/general/exit.h
+++ b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/general/exit.h
@@ -4,4 +4,4 @@
/**
* A notification to ask the server to exit its process.
*/
-DEFINE_NOTIFICATION_TYPE(Notify_Exit, boost::optional<JsonNull>, "exit");
+DEFINE_NOTIFICATION_TYPE(Notify_Exit, optional<JsonNull>, "exit");
diff --git a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/general/lsClientCapabilities.h b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/general/lsClientCapabilities.h
index 29129565e48..4ec9744258f 100644
--- a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/general/lsClientCapabilities.h
+++ b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/general/lsClientCapabilities.h
@@ -18,7 +18,7 @@ struct MarkdownClientCapabilities {
/**
* The version of the parser.
*/
- boost::optional<std::string> version;
+ optional<std::string> version;
MAKE_SWAP_METHOD(MarkdownClientCapabilities, parser, version)
};
@@ -26,19 +26,19 @@ MAKE_REFLECT_STRUCT(MarkdownClientCapabilities, parser, version)
struct lsClientCapabilities {
// Workspace specific client capabilities.
- boost::optional<lsWorkspaceClientCapabilites> workspace;
+ optional<lsWorkspaceClientCapabilites> workspace;
// Text document specific client capabilities.
- boost::optional<lsTextDocumentClientCapabilities> textDocument;
+ optional<lsTextDocumentClientCapabilities> textDocument;
/**
* Window specific client capabilities.
*/
- boost::optional<lsp::Any> window;
+ optional<lsp::Any> window;
/**
* Experimental client capabilities.
*/
- boost::optional<lsp::Any> experimental;
+ optional<lsp::Any> experimental;
MAKE_SWAP_METHOD(lsClientCapabilities, workspace, textDocument, window, experimental)
};
diff --git a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/general/lsServerCapabilities.h b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/general/lsServerCapabilities.h
index d62d3e4dfd6..e8624681b30 100644
--- a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/general/lsServerCapabilities.h
+++ b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/general/lsServerCapabilities.h
@@ -10,7 +10,7 @@
#include "LibLsp/lsp/textDocument/SemanticTokens.h"
-extern void Reflect(Reader&, std::pair<boost::optional<lsTextDocumentSyncKind>, boost::optional<lsTextDocumentSyncOptions> >&);
+extern void Reflect(Reader&, std::pair<optional<lsTextDocumentSyncKind>, optional<lsTextDocumentSyncOptions> >&);
//
// Code Action options.
@@ -32,7 +32,7 @@ struct CodeLensOptions : WorkDoneProgressOptions {
//
// Code lens has a resolve provider as well.
//
- boost::optional<bool> resolveProvider ;
+ optional<bool> resolveProvider ;
MAKE_SWAP_METHOD(CodeLensOptions, workDoneProgress, resolveProvider);
};
MAKE_REFLECT_STRUCT(CodeLensOptions, workDoneProgress, resolveProvider)
@@ -56,7 +56,7 @@ struct RenameOptions : WorkDoneProgressOptions {
//
// Renames should be checked and tested before being executed.
//
- boost::optional<bool> prepareProvider;
+ optional<bool> prepareProvider;
MAKE_SWAP_METHOD(RenameOptions, workDoneProgress, prepareProvider);
};
MAKE_REFLECT_STRUCT(RenameOptions,workDoneProgress,prepareProvider)
@@ -65,11 +65,11 @@ struct DocumentFilter{
//
// A language id, like `typescript`.
//
- boost::optional<std::string> language;
+ optional<std::string> language;
//
// A Uri [scheme](#Uri.scheme), like `file` or `untitled`.
//
- boost::optional<std::string>scheme;
+ optional<std::string>scheme;
//
// A glob pattern, like `*.{ts,js}`.
//
@@ -85,7 +85,7 @@ struct DocumentFilter{
// (e.g., `example.[!0-9]` to match on `example.a`, `example.b`, but
// not `example.0`)
//
- boost::optional<std::string>pattern;
+ optional<std::string>pattern;
MAKE_SWAP_METHOD(DocumentFilter, language, scheme, pattern)
};
MAKE_REFLECT_STRUCT(DocumentFilter, language, scheme, pattern)
@@ -96,7 +96,7 @@ using DocumentSelector = std::vector<DocumentFilter>;
// Document link options
struct lsDocumentLinkOptions :WorkDoneProgressOptions {
// Document links have a resolve provider as well.
- boost::optional<bool> resolveProvider;
+ optional<bool> resolveProvider;
MAKE_SWAP_METHOD(lsDocumentLinkOptions, workDoneProgress, resolveProvider);
};
MAKE_REFLECT_STRUCT(lsDocumentLinkOptions, workDoneProgress,resolveProvider);
@@ -116,7 +116,7 @@ struct TextDocumentRegistrationOptions
// A document selector to identify the scope of the registration. If set to null
// the document selector provided on the client side will be used.
//
- boost::optional<DocumentSelector> documentSelector;
+ optional<DocumentSelector> documentSelector;
MAKE_SWAP_METHOD(TextDocumentRegistrationOptions, documentSelector);
};
@@ -131,7 +131,7 @@ struct StaticRegistrationOptions :public TextDocumentRegistrationOptions
// The id used to register the request. The id can be used to deregister
// the request again. See also Registration#id.
//
- boost::optional<std::string> id;
+ optional<std::string> id;
MAKE_SWAP_METHOD(StaticRegistrationOptions, documentSelector, id)
};
MAKE_REFLECT_STRUCT(StaticRegistrationOptions, documentSelector,id)
@@ -146,7 +146,7 @@ struct WorkspaceFoldersOptions {
//
// The server has support for workspace folders
//
- boost::optional<bool> supported;
+ optional<bool> supported;
//
// Whether the server wants to receive workspace folder
@@ -157,7 +157,7 @@ struct WorkspaceFoldersOptions {
// side. The ID can be used to unregister for these events
// using the `client/unregisterCapability` request.
//
- boost::optional<std::pair< boost::optional<std::string>, boost::optional<bool> > > changeNotifications;
+ optional<std::pair< optional<std::string>, optional<bool> > > changeNotifications;
MAKE_SWAP_METHOD(WorkspaceFoldersOptions, supported, changeNotifications);
};
MAKE_REFLECT_STRUCT(WorkspaceFoldersOptions, supported, changeNotifications);
@@ -185,7 +185,7 @@ struct lsFileOperationPatternOptions {
//
// The pattern should be matched ignoring casing.
//
- boost::optional<bool> ignoreCase;
+ optional<bool> ignoreCase;
MAKE_SWAP_METHOD(lsFileOperationPatternOptions, ignoreCase)
};
MAKE_REFLECT_STRUCT(lsFileOperationPatternOptions, ignoreCase)
@@ -216,12 +216,12 @@ struct lsFileOperationPattern {
//
// Matches both if undefined.
//
- boost::optional<lsFileOperationPatternKind> matches;
+ optional<lsFileOperationPatternKind> matches;
//
// Additional options used during matching.
//
- boost::optional<lsFileOperationPatternOptions> options ;
+ optional<lsFileOperationPatternOptions> options ;
MAKE_SWAP_METHOD(lsFileOperationPattern, glob, matches, options)
};
MAKE_REFLECT_STRUCT(lsFileOperationPattern, glob, matches, options)
@@ -236,12 +236,12 @@ struct lsFileOperationFilter {
//
// A Uri like `file` or `untitled`.
//
- boost::optional<std::string> scheme;
+ optional<std::string> scheme;
//
// The actual file operation pattern.
//
- boost::optional<lsFileOperationPattern> pattern;
+ optional<lsFileOperationPattern> pattern;
MAKE_SWAP_METHOD(lsFileOperationFilter, scheme, pattern)
};
MAKE_REFLECT_STRUCT(lsFileOperationFilter, scheme, pattern)
@@ -254,7 +254,7 @@ struct lsFileOperationRegistrationOptions {
//
// The actual filters.
//
- boost::optional<std::vector<lsFileOperationFilter>> filters;
+ optional<std::vector<lsFileOperationFilter>> filters;
MAKE_SWAP_METHOD(lsFileOperationRegistrationOptions, filters)
};
MAKE_REFLECT_STRUCT(lsFileOperationRegistrationOptions, filters)
@@ -279,38 +279,38 @@ struct WorkspaceServerCapabilities {
// The server is interested in receiving didCreateFiles
// notifications.
//
- boost::optional<lsFileOperationRegistrationOptions> didCreate;
+ optional<lsFileOperationRegistrationOptions> didCreate;
//
// The server is interested in receiving willCreateFiles requests.
//
- boost::optional<lsFileOperationRegistrationOptions> willCreate;
+ optional<lsFileOperationRegistrationOptions> willCreate;
//
// The server is interested in receiving didRenameFiles
// notifications.
//
- boost::optional<lsFileOperationRegistrationOptions> didRename;
+ optional<lsFileOperationRegistrationOptions> didRename;
//
// The server is interested in receiving willRenameFiles requests.
//
- boost::optional<lsFileOperationRegistrationOptions> willRename;
+ optional<lsFileOperationRegistrationOptions> willRename;
//
// The server is interested in receiving didDeleteFiles file
// notifications.
//
- boost::optional<lsFileOperationRegistrationOptions> didDelete;
+ optional<lsFileOperationRegistrationOptions> didDelete;
//
// The server is interested in receiving willDeleteFiles file
// requests.
//
- boost::optional<lsFileOperationRegistrationOptions> willDelete;
+ optional<lsFileOperationRegistrationOptions> willDelete;
MAKE_SWAP_METHOD(lsFileOperations, didCreate, willCreate, didRename, willRename, didDelete, willDelete)
};
- boost::optional<lsFileOperations>fileOperations;
+ optional<lsFileOperations>fileOperations;
MAKE_SWAP_METHOD(WorkspaceServerCapabilities, workspaceFolders, fileOperations)
@@ -356,24 +356,24 @@ struct SemanticTokensWithRegistrationOptions
// Server supports providing semantic tokens for a specific range
// of a document.
//
- boost::optional< std::pair< boost::optional<bool>, boost::optional<lsp::Any> > > range;
+ optional< std::pair< optional<bool>, optional<lsp::Any> > > range;
//
// Server supports providing semantic tokens for a full document.
//
- boost::optional< std::pair< boost::optional<bool>,
- boost::optional<SemanticTokensServerFull> > > full;
+ optional< std::pair< optional<bool>,
+ optional<SemanticTokensServerFull> > > full;
//
// A document selector to identify the scope of the registration. If set to null
// the document selector provided on the client side will be used.
//
- boost::optional < std::vector<DocumentFilter> > documentSelector;
+ optional < std::vector<DocumentFilter> > documentSelector;
//
// The id used to register the request. The id can be used to deregister
// the request again. See also Registration#id.
//
- boost::optional<std::string> id;
+ optional<std::string> id;
MAKE_SWAP_METHOD(SemanticTokensWithRegistrationOptions, legend, range, full, documentSelector, id)
};
MAKE_REFLECT_STRUCT(SemanticTokensWithRegistrationOptions, legend, range, full, documentSelector ,id)
@@ -385,20 +385,20 @@ struct lsServerCapabilities {
// defining each notification or for backwards compatibility the
// TextDocumentSyncKind number.
- boost::optional< std::pair<boost::optional<lsTextDocumentSyncKind>,
- boost::optional<lsTextDocumentSyncOptions> >> textDocumentSync;
+ optional< std::pair<optional<lsTextDocumentSyncKind>,
+ optional<lsTextDocumentSyncOptions> >> textDocumentSync;
// The server provides hover support.
- boost::optional<bool> hoverProvider;
+ optional<bool> hoverProvider;
// The server provides completion support.
- boost::optional < lsCompletionOptions > completionProvider;
+ optional < lsCompletionOptions > completionProvider;
// The server provides signature help support.
- boost::optional < lsSignatureHelpOptions > signatureHelpProvider;
+ optional < lsSignatureHelpOptions > signatureHelpProvider;
// The server provides goto definition support.
- boost::optional< std::pair< boost::optional<bool>, boost::optional<WorkDoneProgressOptions> > > definitionProvider;
+ optional< std::pair< optional<bool>, optional<WorkDoneProgressOptions> > > definitionProvider;
//
@@ -406,44 +406,44 @@ struct lsServerCapabilities {
//
// Since 3.6.0
//
- boost::optional< std::pair< boost::optional<bool>, boost::optional<StaticRegistrationOptions> > > typeDefinitionProvider ;
+ optional< std::pair< optional<bool>, optional<StaticRegistrationOptions> > > typeDefinitionProvider ;
// The server provides implementation support.
- boost::optional< std::pair< boost::optional<bool>, boost::optional<StaticRegistrationOptions> > > implementationProvider ;
+ optional< std::pair< optional<bool>, optional<StaticRegistrationOptions> > > implementationProvider ;
// The server provides find references support.
- boost::optional< std::pair< boost::optional<bool>, boost::optional<WorkDoneProgressOptions> > > referencesProvider ;
+ optional< std::pair< optional<bool>, optional<WorkDoneProgressOptions> > > referencesProvider ;
// The server provides document highlight support.
- boost::optional< std::pair< boost::optional<bool>, boost::optional<WorkDoneProgressOptions> > > documentHighlightProvider ;
+ optional< std::pair< optional<bool>, optional<WorkDoneProgressOptions> > > documentHighlightProvider ;
// The server provides document symbol support.
- boost::optional< std::pair< boost::optional<bool>, boost::optional<WorkDoneProgressOptions> > > documentSymbolProvider ;
+ optional< std::pair< optional<bool>, optional<WorkDoneProgressOptions> > > documentSymbolProvider ;
// The server provides workspace symbol support.
- boost::optional< std::pair< boost::optional<bool>, boost::optional<WorkDoneProgressOptions> > > workspaceSymbolProvider ;
+ optional< std::pair< optional<bool>, optional<WorkDoneProgressOptions> > > workspaceSymbolProvider ;
// The server provides code actions.
- boost::optional< std::pair< boost::optional<bool>, boost::optional<CodeActionOptions> > > codeActionProvider ;
+ optional< std::pair< optional<bool>, optional<CodeActionOptions> > > codeActionProvider ;
// The server provides code lens.
- boost::optional<CodeLensOptions> codeLensProvider;
+ optional<CodeLensOptions> codeLensProvider;
// The server provides document formatting.
- boost::optional< std::pair< boost::optional<bool>, boost::optional<WorkDoneProgressOptions> > > documentFormattingProvider ;
+ optional< std::pair< optional<bool>, optional<WorkDoneProgressOptions> > > documentFormattingProvider ;
// The server provides document range formatting.
- boost::optional< std::pair< boost::optional<bool>, boost::optional<WorkDoneProgressOptions> > > documentRangeFormattingProvider ;
+ optional< std::pair< optional<bool>, optional<WorkDoneProgressOptions> > > documentRangeFormattingProvider ;
// The server provides document formatting on typing.
- boost::optional<lsDocumentOnTypeFormattingOptions> documentOnTypeFormattingProvider;
+ optional<lsDocumentOnTypeFormattingOptions> documentOnTypeFormattingProvider;
// The server provides rename support.
- boost::optional< std::pair< boost::optional<bool>, boost::optional<RenameOptions> > > renameProvider;
+ optional< std::pair< optional<bool>, optional<RenameOptions> > > renameProvider;
// The server provides document link support.
- boost::optional<lsDocumentLinkOptions > documentLinkProvider;
+ optional<lsDocumentLinkOptions > documentLinkProvider;
//
@@ -451,7 +451,7 @@ struct lsServerCapabilities {
//
// @since 3.6.0
//
- boost::optional< std::pair< boost::optional<bool>, boost::optional<DocumentColorOptions> > > colorProvider;
+ optional< std::pair< optional<bool>, optional<DocumentColorOptions> > > colorProvider;
//
@@ -459,22 +459,22 @@ struct lsServerCapabilities {
//
// @since 3.10.0
//
- boost::optional < std::pair< boost::optional<bool>, boost::optional<FoldingRangeOptions> > > foldingRangeProvider;
+ optional < std::pair< optional<bool>, optional<FoldingRangeOptions> > > foldingRangeProvider;
// The server provides execute command support.
- boost::optional < lsExecuteCommandOptions >executeCommandProvider;
+ optional < lsExecuteCommandOptions >executeCommandProvider;
//
// Workspace specific server capabilities
//
- boost::optional< WorkspaceServerCapabilities > workspace;
+ optional< WorkspaceServerCapabilities > workspace;
//
// Semantic highlighting server capabilities.
//
- boost::optional< SemanticHighlightingServerCapabilities >semanticHighlighting;
+ optional< SemanticHighlightingServerCapabilities >semanticHighlighting;
//
// Server capability for calculating super- and subtype hierarchies.
@@ -486,31 +486,31 @@ struct lsServerCapabilities {
// language feature</a> is not yet part of the official LSP specification.
//
- boost::optional< std::pair< boost::optional<bool>,
- boost::optional<StaticRegistrationOptions> > > typeHierarchyProvider;
+ optional< std::pair< optional<bool>,
+ optional<StaticRegistrationOptions> > > typeHierarchyProvider;
//
// The server provides Call Hierarchy support.
//
- boost::optional< std::pair< boost::optional<bool>,
- boost::optional<StaticRegistrationOptions> > > callHierarchyProvider;
+ optional< std::pair< optional<bool>,
+ optional<StaticRegistrationOptions> > > callHierarchyProvider;
//
// The server provides selection range support.
//
// Since 3.15.0
//
- boost::optional< std::pair< boost::optional<bool>,
- boost::optional<StaticRegistrationOptions> > > selectionRangeProvider;
+ optional< std::pair< optional<bool>,
+ optional<StaticRegistrationOptions> > > selectionRangeProvider;
//
// The server provides linked editing range support.
//
// Since 3.16.0
//
- boost::optional< std::pair< boost::optional<bool>,
- boost::optional<StaticRegistrationOptions> > > linkedEditingRangeProvider;
+ optional< std::pair< optional<bool>,
+ optional<StaticRegistrationOptions> > > linkedEditingRangeProvider;
//
@@ -518,17 +518,17 @@ struct lsServerCapabilities {
//
// Since 3.16.0
//
- boost::optional < SemanticTokensWithRegistrationOptions> semanticTokensProvider;
+ optional < SemanticTokensWithRegistrationOptions> semanticTokensProvider;
//
// Whether server provides moniker support.
//
// Since 3.16.0
//
- boost::optional< std::pair< boost::optional<bool>,
- boost::optional<StaticRegistrationOptions> > > monikerProvider;
+ optional< std::pair< optional<bool>,
+ optional<StaticRegistrationOptions> > > monikerProvider;
- boost::optional<lsp::Any> experimental;
+ optional<lsp::Any> experimental;
MAKE_SWAP_METHOD(lsServerCapabilities,
diff --git a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/general/lsTextDocumentClientCapabilities.h b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/general/lsTextDocumentClientCapabilities.h
index 4e66bcb7ae9..1523254d633 100644
--- a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/general/lsTextDocumentClientCapabilities.h
+++ b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/general/lsTextDocumentClientCapabilities.h
@@ -14,7 +14,7 @@
struct WorkDoneProgressOptions
{
- boost::optional<bool>workDoneProgress;
+ optional<bool>workDoneProgress;
MAKE_SWAP_METHOD(WorkDoneProgressOptions, workDoneProgress);
};
MAKE_REFLECT_STRUCT(WorkDoneProgressOptions, workDoneProgress);
@@ -24,7 +24,7 @@ struct lsCompletionOptions:WorkDoneProgressOptions
{
// The server provides support to resolve additional
// information for a completion item.
- boost::optional<bool> resolveProvider = false;
+ optional<bool> resolveProvider = false;
//
// Most tools trigger completion request automatically without explicitly requesting
@@ -37,14 +37,14 @@ struct lsCompletionOptions:WorkDoneProgressOptions
// an identifier (for example `.` in JavaScript) list them in `triggerCharacters`.
//
// https://github.com/Microsoft/language-server-protocol/issues/138.
- boost::optional< std::vector<std::string> > triggerCharacters ;
+ optional< std::vector<std::string> > triggerCharacters ;
//
// The list of all possible characters that commit a completion. This field can be used
// if clients don't support individual commmit characters per completion item. See
// `ClientCapabilities.textDocument.completion.completionItem.commitCharactersSupport`
//
- boost::optional< std::vector<std::string> > allCommitCharacters;
+ optional< std::vector<std::string> > allCommitCharacters;
MAKE_SWAP_METHOD(lsCompletionOptions, workDoneProgress, resolveProvider, triggerCharacters, allCommitCharacters);
};
@@ -102,16 +102,16 @@ MAKE_REFLECT_TYPE_PROXY(lsTextDocumentSyncKind)
struct lsTextDocumentSyncOptions {
// Open and close notifications are sent to the server.
- boost::optional<bool> openClose ;
+ optional<bool> openClose ;
// Change notificatins are sent to the server. See TextDocumentSyncKind.None,
// TextDocumentSyncKind.Full and TextDocumentSyncKindIncremental.
- boost::optional< lsTextDocumentSyncKind> change ;
+ optional< lsTextDocumentSyncKind> change ;
// Will save notifications are sent to the server.
- boost::optional<bool> willSave;
+ optional<bool> willSave;
// Will save wait until requests are sent to the server.
- boost::optional<bool> willSaveWaitUntil;
+ optional<bool> willSaveWaitUntil;
// Save notifications are sent to the server.
- boost::optional<lsSaveOptions> save;
+ optional<lsSaveOptions> save;
MAKE_SWAP_METHOD(lsTextDocumentSyncOptions,
openClose,
@@ -129,18 +129,18 @@ MAKE_REFLECT_STRUCT(lsTextDocumentSyncOptions,
struct SynchronizationCapabilities {
// Whether text document synchronization supports dynamic registration.
- boost::optional<bool> dynamicRegistration;
+ optional<bool> dynamicRegistration;
// The client supports sending will save notifications.
- boost::optional<bool> willSave;
+ optional<bool> willSave;
// The client supports sending a will save request and
// waits for a response providing text edits which will
// be applied to the document before it is saved.
- boost::optional<bool> willSaveWaitUntil;
+ optional<bool> willSaveWaitUntil;
// The client supports did save notifications.
- boost::optional<bool> didSave;
+ optional<bool> didSave;
MAKE_SWAP_METHOD(SynchronizationCapabilities,
dynamicRegistration,
@@ -156,7 +156,7 @@ MAKE_REFLECT_STRUCT(SynchronizationCapabilities,
struct CompletionItemKindCapabilities
{
- boost::optional<std::vector<lsCompletionItemKind> >valueSet;
+ optional<std::vector<lsCompletionItemKind> >valueSet;
MAKE_SWAP_METHOD(CompletionItemKindCapabilities, valueSet);
};
MAKE_REFLECT_STRUCT(CompletionItemKindCapabilities, valueSet);
@@ -168,26 +168,26 @@ struct CompletionItemCapabilities {
// and `${3:foo}`. `$0` defines the final tab stop, it defaults to
// the end of the snippet. Placeholders with equal identifiers are linked,
// that is typing in one will update others too.
- boost::optional<bool> snippetSupport;
+ optional<bool> snippetSupport;
// Client supports commit characters on a completion item.
- boost::optional<bool> commitCharactersSupport;
+ optional<bool> commitCharactersSupport;
// Client supports the following content formats for the documentation
// property. The order describes the preferred format of the client.
- boost::optional< std::vector<std::string> > documentationFormat;
+ optional< std::vector<std::string> > documentationFormat;
// Client supports the deprecated property on a completion item.
- boost::optional<bool> deprecatedSupport;
+ optional<bool> deprecatedSupport;
//
// Client supports the preselect property on a completion item.
//
- boost::optional<bool> preselectSupport;
+ optional<bool> preselectSupport;
MAKE_SWAP_METHOD(CompletionItemCapabilities,
snippetSupport,
@@ -207,25 +207,25 @@ MAKE_REFLECT_STRUCT(CompletionItemCapabilities,
//
struct CompletionCapabilities {
// Whether completion supports dynamic registration.
- boost::optional<bool> dynamicRegistration;
+ optional<bool> dynamicRegistration;
// The client supports the following `CompletionItem` specific
// capabilities.
- boost::optional<CompletionItemCapabilities> completionItem;
+ optional<CompletionItemCapabilities> completionItem;
//
// The client supports the following `CompletionItemKind` specific
// capabilities.
//
- boost::optional<CompletionItemKindCapabilities> completionItemKind;
+ optional<CompletionItemKindCapabilities> completionItemKind;
//
// The client supports sending additional context information for a
// `textDocument/completion` request.
//
- boost::optional<bool> contextSupport;
+ optional<bool> contextSupport;
MAKE_SWAP_METHOD(CompletionCapabilities,
@@ -246,7 +246,7 @@ struct HoverCapabilities:public DynamicRegistrationCapabilities
//
// See {@link MarkupKind} for allowed values.
//
- boost::optional<std::vector<std::string>> contentFormat;
+ optional<std::vector<std::string>> contentFormat;
MAKE_SWAP_METHOD(HoverCapabilities, dynamicRegistration, contentFormat);
};
@@ -262,7 +262,7 @@ struct ParameterInformationCapabilities {
//
// Since 3.14.0
//
- boost::optional<bool> labelOffsetSupport;
+ optional<bool> labelOffsetSupport;
MAKE_SWAP_METHOD(ParameterInformationCapabilities, labelOffsetSupport);
};
@@ -293,7 +293,7 @@ struct SignatureHelpCapabilities :public DynamicRegistrationCapabilities
// The client supports the following `SignatureInformation`
// specific properties.
//
- boost::optional< SignatureInformationCapabilities > signatureInformation;
+ optional< SignatureInformationCapabilities > signatureInformation;
MAKE_SWAP_METHOD(SignatureHelpCapabilities, dynamicRegistration, signatureInformation)
};
@@ -303,12 +303,12 @@ struct DocumentSymbolCapabilities :public DynamicRegistrationCapabilities {
//
// Specific capabilities for the `SymbolKind`.
//
- boost::optional<SymbolKindCapabilities> symbolKind;
+ optional<SymbolKindCapabilities> symbolKind;
//
// The client support hierarchical document symbols.
//
- boost::optional<bool> hierarchicalDocumentSymbolSupport;
+ optional<bool> hierarchicalDocumentSymbolSupport;
MAKE_SWAP_METHOD(DocumentSymbolCapabilities, dynamicRegistration, symbolKind, hierarchicalDocumentSymbolSupport)
};
@@ -318,7 +318,7 @@ struct DeclarationCapabilities:public DynamicRegistrationCapabilities{
//
// The client supports additional metadata in the form of declaration links.
//
- boost::optional<bool>linkSupport;
+ optional<bool>linkSupport;
MAKE_SWAP_METHOD(DeclarationCapabilities, dynamicRegistration, linkSupport);
};
@@ -335,7 +335,7 @@ struct CodeActionKindCapabilities
//
// See {@link CodeActionKind} for allowed values.
//
- boost::optional< std::vector< std::string> >valueSet;
+ optional< std::vector< std::string> >valueSet;
MAKE_SWAP_METHOD(CodeActionKindCapabilities, valueSet)
};
@@ -343,7 +343,7 @@ MAKE_REFLECT_STRUCT(CodeActionKindCapabilities,valueSet)
struct CodeActionLiteralSupportCapabilities
{
- boost::optional<CodeActionKindCapabilities> codeActionKind;
+ optional<CodeActionKindCapabilities> codeActionKind;
MAKE_SWAP_METHOD(CodeActionLiteralSupportCapabilities, codeActionKind)
};
@@ -354,7 +354,7 @@ struct CodeActionCapabilities:public DynamicRegistrationCapabilities{
// The client support code action literals as a valid
// response of the `textDocument/codeAction` request.
//
- boost::optional<CodeActionLiteralSupportCapabilities> codeActionLiteralSupport;
+ optional<CodeActionLiteralSupportCapabilities> codeActionLiteralSupport;
MAKE_SWAP_METHOD(CodeActionCapabilities, dynamicRegistration, codeActionLiteralSupport)
};
@@ -365,7 +365,7 @@ struct RenameCapabilities :public DynamicRegistrationCapabilities {
// The client support code action literals as a valid
// response of the `textDocument/codeAction` request.
//
- boost::optional<bool> prepareSupport;
+ optional<bool> prepareSupport;
MAKE_SWAP_METHOD(RenameCapabilities, dynamicRegistration, prepareSupport)
};
@@ -385,7 +385,7 @@ struct PublishDiagnosticsClientCapabilities :public DynamicRegistrationCapabilit
* The client support code action literals as a valid
* response of the `textDocument/codeAction` request.
*/
- boost::optional<bool> relatedInformation;
+ optional<bool> relatedInformation;
/**
* Client supports the tag property to provide meta data about a diagnostic.
@@ -398,7 +398,7 @@ struct PublishDiagnosticsClientCapabilities :public DynamicRegistrationCapabilit
*
* Since 3.15
*/
- boost::optional < std::pair<boost::optional<bool>, boost::optional<DiagnosticsTagSupport> > > tagSupport;
+ optional < std::pair<optional<bool>, optional<DiagnosticsTagSupport> > > tagSupport;
/**
* Whether the client interprets the version property of the
@@ -406,14 +406,14 @@ struct PublishDiagnosticsClientCapabilities :public DynamicRegistrationCapabilit
*
* Since 3.15.0
*/
- boost::optional<bool> versionSupport;
+ optional<bool> versionSupport;
/**
* Client supports a codeDescription property
*
* @since 3.16.0
*/
- boost::optional<bool> codeDescriptionSupport ;
+ optional<bool> codeDescriptionSupport ;
/**
* Whether code action supports the `data` property which is
@@ -422,7 +422,7 @@ struct PublishDiagnosticsClientCapabilities :public DynamicRegistrationCapabilit
*
* @since 3.16.0
*/
- boost::optional<bool> dataSupport ;
+ optional<bool> dataSupport ;
MAKE_SWAP_METHOD(PublishDiagnosticsClientCapabilities, dynamicRegistration, relatedInformation, tagSupport,versionSupport,codeDescriptionSupport,dataSupport)
@@ -435,13 +435,13 @@ struct FoldingRangeCapabilities :public DynamicRegistrationCapabilities {
// The maximum number of folding ranges that the client prefers to receive per document. The value serves as a
// hint, servers are free to follow the limit.
//
- boost::optional<int> rangeLimit;
+ optional<int> rangeLimit;
//
// If set, the client signals that it only supports folding complete lines. If set, client will
// ignore specified `startCharacter` and `endCharacter` properties in a FoldingRange.
//
- boost::optional<bool> lineFoldingOnly;
+ optional<bool> lineFoldingOnly;
MAKE_SWAP_METHOD(FoldingRangeCapabilities, dynamicRegistration, rangeLimit, lineFoldingOnly)
};
MAKE_REFLECT_STRUCT(FoldingRangeCapabilities, dynamicRegistration, rangeLimit,lineFoldingOnly)
@@ -452,7 +452,7 @@ struct SemanticHighlightingCapabilities :public DynamicRegistrationCapabilities
// The client support code action literals as a valid
// response of the `textDocument/codeAction` request.
//
- boost::optional<bool> semanticHighlighting;
+ optional<bool> semanticHighlighting;
MAKE_SWAP_METHOD(SemanticHighlightingCapabilities, dynamicRegistration, semanticHighlighting)
};
@@ -478,13 +478,13 @@ struct SemanticTokensClientCapabilities : public DynamicRegistrationCapabilitie
// The client will send the `textDocument/semanticTokens/range` request
// if the server provides a corresponding handler.
//
- boost::optional<std::pair< boost::optional<bool>,
- boost::optional<SemanticTokensClientCapabilitiesRequestsFull>>> range;
+ optional<std::pair< optional<bool>,
+ optional<SemanticTokensClientCapabilitiesRequestsFull>>> range;
//
// The client will send the `textDocument/semanticTokens/full` request
// if the server provides a corresponding handler.
//
- boost::optional<std::pair< boost::optional<bool>, boost::optional<lsp::Any>>> full;
+ optional<std::pair< optional<bool>, optional<lsp::Any>>> full;
MAKE_SWAP_METHOD(lsRequests, range, full)
};
@@ -505,12 +505,12 @@ struct SemanticTokensClientCapabilities : public DynamicRegistrationCapabilitie
//
// Whether the client supports tokens that can overlap each other.
//
- boost::optional < bool >overlappingTokenSupport;
+ optional < bool >overlappingTokenSupport;
//
// Whether the client supports tokens that can span multiple lines.
//
- boost::optional < bool > multilineTokenSupport;
+ optional < bool > multilineTokenSupport;
MAKE_SWAP_METHOD(SemanticTokensClientCapabilities, dynamicRegistration,requests, tokenTypes, tokenModifiers,
formats, overlappingTokenSupport, multilineTokenSupport)
@@ -527,37 +527,37 @@ struct lsTextDocumentClientCapabilities {
// Capabilities specific to the `textDocument/completion`
- boost::optional<CompletionCapabilities> completion;
+ optional<CompletionCapabilities> completion;
// Capabilities specific to the `textDocument/hover`
- boost::optional<HoverCapabilities> hover;
+ optional<HoverCapabilities> hover;
// Capabilities specific to the `textDocument/signatureHelp`
- boost::optional<SignatureHelpCapabilities> signatureHelp;
+ optional<SignatureHelpCapabilities> signatureHelp;
// Capabilities specific to the `textDocument/references`
- boost::optional<DynamicRegistrationCapabilities> references;
+ optional<DynamicRegistrationCapabilities> references;
// Capabilities specific to the `textDocument/documentHighlight`
- boost::optional<DynamicRegistrationCapabilities> documentHighlight;
+ optional<DynamicRegistrationCapabilities> documentHighlight;
// Capabilities specific to the `textDocument/documentSymbol`
- boost::optional<DocumentSymbolCapabilities> documentSymbol;
+ optional<DocumentSymbolCapabilities> documentSymbol;
// Capabilities specific to the `textDocument/formatting`
- boost::optional<DynamicRegistrationCapabilities> formatting;
+ optional<DynamicRegistrationCapabilities> formatting;
// Capabilities specific to the `textDocument/rangeFormatting`
- boost::optional<DynamicRegistrationCapabilities> rangeFormatting;
+ optional<DynamicRegistrationCapabilities> rangeFormatting;
// Capabilities specific to the `textDocument/onTypeFormatting`
- boost::optional<DynamicRegistrationCapabilities> onTypeFormatting;
+ optional<DynamicRegistrationCapabilities> onTypeFormatting;
//
@@ -565,12 +565,12 @@ struct lsTextDocumentClientCapabilities {
//
// Since 3.14.0
//
- boost::optional< DeclarationCapabilities> declaration;
+ optional< DeclarationCapabilities> declaration;
typedef DeclarationCapabilities DefinitionCapabilities;
// Capabilities specific to the `textDocument/definition`
- boost::optional<DefinitionCapabilities> definition;
+ optional<DefinitionCapabilities> definition;
@@ -580,23 +580,23 @@ struct lsTextDocumentClientCapabilities {
// Since 3.6.0
//
typedef DeclarationCapabilities TypeDefinitionCapabilities;
- boost::optional<TypeDefinitionCapabilities> typeDefinition;
+ optional<TypeDefinitionCapabilities> typeDefinition;
typedef DeclarationCapabilities ImplementationCapabilities;
// Capabilities specific to the `textDocument/implementation`
- boost::optional<ImplementationCapabilities> implementation;
+ optional<ImplementationCapabilities> implementation;
// Capabilities specific to the `textDocument/codeAction`
- boost::optional<CodeActionCapabilities> codeAction;
+ optional<CodeActionCapabilities> codeAction;
// Capabilities specific to the `textDocument/codeLens`
- boost::optional<DynamicRegistrationCapabilities> codeLens;
+ optional<DynamicRegistrationCapabilities> codeLens;
// Capabilities specific to the `textDocument/documentLink`
- boost::optional<DynamicRegistrationCapabilities> documentLink;
+ optional<DynamicRegistrationCapabilities> documentLink;
//
// Capabilities specific to the `textDocument/documentColor` and the
@@ -604,33 +604,33 @@ struct lsTextDocumentClientCapabilities {
//
// Since 3.6.0
//
- boost::optional<DynamicRegistrationCapabilities> colorProvider;
+ optional<DynamicRegistrationCapabilities> colorProvider;
// Capabilities specific to the `textDocument/rename`
- boost::optional<RenameCapabilities> rename;
+ optional<RenameCapabilities> rename;
//
// Capabilities specific to `textDocument/publishDiagnostics`.
//
- boost::optional<PublishDiagnosticsClientCapabilities> publishDiagnostics;
+ optional<PublishDiagnosticsClientCapabilities> publishDiagnostics;
//
// Capabilities specific to `textDocument/foldingRange` requests.
//
// Since 3.10.0
//
- boost::optional< FoldingRangeCapabilities > foldingRange;
+ optional< FoldingRangeCapabilities > foldingRange;
//
// Capabilities specific to {@code textDocument/semanticHighlighting}.
//
- boost::optional< SemanticHighlightingCapabilities > semanticHighlightingCapabilities;
+ optional< SemanticHighlightingCapabilities > semanticHighlightingCapabilities;
//
// Capabilities specific to {@code textDocument/typeHierarchy}.
//
- boost::optional< DynamicRegistrationCapabilities > typeHierarchyCapabilities;
+ optional< DynamicRegistrationCapabilities > typeHierarchyCapabilities;
@@ -638,35 +638,35 @@ struct lsTextDocumentClientCapabilities {
// Capabilities specific to `textDocument/selectionRange` requests
//
- boost::optional< DynamicRegistrationCapabilities > selectionRange;
+ optional< DynamicRegistrationCapabilities > selectionRange;
//
// Capabilities specific to the `textDocument/linkedEditingRange` request.
//
// @since 3.16.0
//
- boost::optional< DynamicRegistrationCapabilities > linkedEditingRange;
+ optional< DynamicRegistrationCapabilities > linkedEditingRange;
//
// Capabilities specific to the various call hierarchy requests.
//
// @since 3.16.0
//
- boost::optional< DynamicRegistrationCapabilities > callHierarchy;
+ optional< DynamicRegistrationCapabilities > callHierarchy;
//
// Capabilities specific to the various semantic token requests.
//
// @since 3.16.0
//
- boost::optional< SemanticTokensClientCapabilities > semanticTokens;
+ optional< SemanticTokensClientCapabilities > semanticTokens;
//
// Capabilities specific to the `textDocument/moniker` request.
//
// @since 3.16.0
//
- boost::optional< DynamicRegistrationCapabilities > moniker;
+ optional< DynamicRegistrationCapabilities > moniker;
MAKE_SWAP_METHOD(lsTextDocumentClientCapabilities,
synchronization,
diff --git a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/general/lsWorkspaceClientCapabilites.h b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/general/lsWorkspaceClientCapabilites.h
index ee672aa1113..4b48aec4144 100644
--- a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/general/lsWorkspaceClientCapabilites.h
+++ b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/general/lsWorkspaceClientCapabilites.h
@@ -26,7 +26,7 @@ struct lschangeAnnotationSupport
* for instance all edits labelled with "Changes in Strings" would
* be a tree node.
*/
- boost::optional<bool> groupsOnLabel;
+ optional<bool> groupsOnLabel;
MAKE_SWAP_METHOD(lschangeAnnotationSupport, groupsOnLabel)
};
MAKE_REFLECT_STRUCT(lschangeAnnotationSupport, groupsOnLabel)
@@ -35,7 +35,7 @@ struct WorkspaceEditCapabilities {
/**
* The client supports versioned document changes in `WorkspaceEdit`s
*/
- boost::optional<bool> documentChanges;
+ optional<bool> documentChanges;
/**
* The client supports resource changes
@@ -44,7 +44,7 @@ struct WorkspaceEditCapabilities {
* @deprecated Since LSP introduces resource operations, use {link #resourceOperations}
*/
- boost::optional<bool> resourceChanges;
+ optional<bool> resourceChanges;
/**
* The resource operations the client supports. Clients should at least
@@ -52,7 +52,7 @@ struct WorkspaceEditCapabilities {
*
* @since 3.13.0
*/
- boost::optional< std::vector<std::string> > resourceOperations;
+ optional< std::vector<std::string> > resourceOperations;
/**
* The failure handling strategy of a client if applying the workspace edit
@@ -60,7 +60,7 @@ struct WorkspaceEditCapabilities {
*
* See {@link FailureHandlingKind} for allowed values.
*/
- boost::optional<std::string > failureHandling;
+ optional<std::string > failureHandling;
/**
* Whether the client normalizes line endings to the client specific
@@ -70,7 +70,7 @@ struct WorkspaceEditCapabilities {
*
* @since 3.16.0
*/
- boost::optional<bool> normalizesLineEndings;;
+ optional<bool> normalizesLineEndings;;
/**
* Whether the client in general supports change annotations on text edits,
@@ -78,7 +78,7 @@ struct WorkspaceEditCapabilities {
*
* @since 3.16.0
*/
- boost::optional<lschangeAnnotationSupport> changeAnnotationSupport;
+ optional<lschangeAnnotationSupport> changeAnnotationSupport;
MAKE_SWAP_METHOD(WorkspaceEditCapabilities, documentChanges, resourceChanges, resourceOperations, failureHandling, normalizesLineEndings, changeAnnotationSupport)
@@ -88,7 +88,7 @@ MAKE_REFLECT_STRUCT(WorkspaceEditCapabilities,documentChanges, resourceChanges,
struct DynamicRegistrationCapabilities {
// Did foo notification supports dynamic registration.
- boost::optional<bool> dynamicRegistration;
+ optional<bool> dynamicRegistration;
MAKE_SWAP_METHOD(DynamicRegistrationCapabilities,
dynamicRegistration);
@@ -102,7 +102,7 @@ MAKE_REFLECT_STRUCT(DynamicRegistrationCapabilities,
// Workspace specific client capabilities.
struct SymbolKindCapabilities
{
- boost::optional< std::vector<lsSymbolKind> > valueSet;
+ optional< std::vector<lsSymbolKind> > valueSet;
MAKE_SWAP_METHOD(SymbolKindCapabilities, valueSet)
@@ -117,7 +117,7 @@ struct SymbolCapabilities :public DynamicRegistrationCapabilities {
/**
* Specific capabilities for the `SymbolKind` in the `workspace/symbol` request.
*/
- boost::optional<SymbolKindCapabilities> symbolKind;
+ optional<SymbolKindCapabilities> symbolKind;
MAKE_SWAP_METHOD(SymbolCapabilities,
symbolKind, dynamicRegistration)
@@ -132,37 +132,37 @@ struct lsFileOperations
* Whether the client supports dynamic registration for file
* requests/notifications.
*/
- boost::optional<bool> dynamicRegistration ;
+ optional<bool> dynamicRegistration ;
/**
* The client has support for sending didCreateFiles notifications.
*/
- boost::optional<bool>didCreate ;
+ optional<bool>didCreate ;
/**
* The client has support for sending willCreateFiles requests.
*/
- boost::optional<bool>willCreate ;
+ optional<bool>willCreate ;
/**
* The client has support for sending didRenameFiles notifications.
*/
- boost::optional<bool>didRename ;
+ optional<bool>didRename ;
/**
* The client has support for sending willRenameFiles requests.
*/
- boost::optional<bool>willRename ;
+ optional<bool>willRename ;
/**
* The client has support for sending didDeleteFiles notifications.
*/
- boost::optional<bool>didDelete ;
+ optional<bool>didDelete ;
/**
* The client has support for sending willDeleteFiles requests.
*/
- boost::optional<bool> willDelete ;
+ optional<bool> willDelete ;
MAKE_SWAP_METHOD(lsFileOperations, dynamicRegistration, didCreate, willCreate,
didRename, willRename, didDelete, willDelete)
};
@@ -171,28 +171,28 @@ MAKE_REFLECT_STRUCT(lsFileOperations, dynamicRegistration, didCreate, willCreate
struct lsWorkspaceClientCapabilites {
// The client supports applying batch edits to the workspace.
- boost::optional<bool> applyEdit;
+ optional<bool> applyEdit;
// Capabilities specific to `WorkspaceEdit`s
- boost::optional<WorkspaceEditCapabilities> workspaceEdit;
+ optional<WorkspaceEditCapabilities> workspaceEdit;
// Capabilities specific to the `workspace/didChangeConfiguration`
// notification.
- boost::optional<DynamicRegistrationCapabilities> didChangeConfiguration;
+ optional<DynamicRegistrationCapabilities> didChangeConfiguration;
// Capabilities specific to the `workspace/didChangeWatchedFiles`
// notification.
- boost::optional<DynamicRegistrationCapabilities> didChangeWatchedFiles;
+ optional<DynamicRegistrationCapabilities> didChangeWatchedFiles;
// Capabilities specific to the `workspace/symbol` request.
- boost::optional<SymbolCapabilities> symbol;
+ optional<SymbolCapabilities> symbol;
// Capabilities specific to the `workspace/executeCommand` request.
- boost::optional<DynamicRegistrationCapabilities> executeCommand;
+ optional<DynamicRegistrationCapabilities> executeCommand;
/**
@@ -200,14 +200,14 @@ struct lsWorkspaceClientCapabilites {
*
* Since 3.6.0
*/
- boost::optional<bool> workspaceFolders;
+ optional<bool> workspaceFolders;
/**
* The client supports `workspace/configuration` requests.
*
* Since 3.6.0
*/
- boost::optional<bool> configuration;
+ optional<bool> configuration;
/**
@@ -216,7 +216,7 @@ struct lsWorkspaceClientCapabilites {
*
* @since 3.16.0
*/
- boost::optional<DynamicRegistrationCapabilities> semanticTokens ;
+ optional<DynamicRegistrationCapabilities> semanticTokens ;
/**
* Capabilities specific to the code lens requests scoped to the
@@ -224,14 +224,14 @@ struct lsWorkspaceClientCapabilites {
*
* @since 3.16.0
*/
- boost::optional<DynamicRegistrationCapabilities> codeLens ;
+ optional<DynamicRegistrationCapabilities> codeLens ;
/**
* The client has support for file requests/notifications.
*
* @since 3.16.0
*/
- boost::optional<lsFileOperations> fileOperations;
+ optional<lsFileOperations> fileOperations;
MAKE_SWAP_METHOD(lsWorkspaceClientCapabilites,
applyEdit,
diff --git a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/general/progress.h b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/general/progress.h
index bf70d588421..d21cfc52f84 100644
--- a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/general/progress.h
+++ b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/general/progress.h
@@ -8,7 +8,7 @@
//and partial result progress to support streaming of results.
struct ProgressParams
{
- std::pair<boost::optional<std::string> , boost::optional<int> > token;
+ std::pair<optional<std::string> , optional<int> > token;
lsp::Any value;
MAKE_SWAP_METHOD(ProgressParams, token, value)
};
diff --git a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/general/shutdown.h b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/general/shutdown.h
index 5366ff89d6b..25713345037 100644
--- a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/general/shutdown.h
+++ b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/general/shutdown.h
@@ -11,5 +11,5 @@
* that asks the server to exit.
*/
-DEFINE_REQUEST_RESPONSE_TYPE(td_shutdown, boost::optional<JsonNull>, boost::optional<lsp::Any>, "shutdown");
+DEFINE_REQUEST_RESPONSE_TYPE(td_shutdown, optional<JsonNull>, optional<lsp::Any>, "shutdown");
diff --git a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/language/language.h b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/language/language.h
index 3f649469724..96b4b61fa95 100644
--- a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/language/language.h
+++ b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/language/language.h
@@ -89,7 +89,7 @@ struct ActionableNotification {
*
*/
- boost::optional<lsp::Any> data;
+ optional<lsp::Any> data;
/**
diff --git a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/location_type.h b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/location_type.h
index c4197917a9e..f1d8070bf5b 100644
--- a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/location_type.h
+++ b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/location_type.h
@@ -35,7 +35,7 @@ struct LocationLink
* Used as the underlined span for mouse interaction. Defaults to the word range at
* the mouse position.
*/
- boost::optional<lsRange> originSelectionRange;
+ optional<lsRange> originSelectionRange;
/**
* The target resource identifier of this link.
diff --git a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsAny.h b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsAny.h
index 035382669f9..49a917e4f6c 100644
--- a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsAny.h
+++ b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsAny.h
@@ -64,7 +64,7 @@ namespace lsp
template <typename T>
bool GetForMapHelper(T& value);
bool GetForMapHelper(std::string& value);
- bool GetForMapHelper(boost::optional<std::string>& value);
+ bool GetForMapHelper(optional<std::string>& value);
private:
std::unique_ptr<Reader> GetReader();
std::unique_ptr<Writer> GetWriter() const;
diff --git a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsCodeAction.h b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsCodeAction.h
index cf0a2aa65b7..1b398cae2b0 100644
--- a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsCodeAction.h
+++ b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsCodeAction.h
@@ -24,24 +24,24 @@ struct CodeAction
*
* Used to filter code actions.
*/
- boost::optional < std::string> kind;
+ optional < std::string> kind;
/**
* The diagnostics that this code action resolves.
*/
- boost::optional < std::vector<lsDiagnostic>> diagnostics;
+ optional < std::vector<lsDiagnostic>> diagnostics;
/**
* The workspace edit this code action performs.
*/
- boost::optional < lsWorkspaceEdit >edit;
+ optional < lsWorkspaceEdit >edit;
/**
* A command this code action executes. If a code action
* provides a edit and a command, first the edit is
* executed and then the command.
*/
- boost::optional< lsCommandWithAny > command;
+ optional< lsCommandWithAny > command;
MAKE_SWAP_METHOD(CodeAction, title, kind, diagnostics, edit, command)
};
@@ -50,7 +50,7 @@ struct TextDocumentCodeAction
{
- typedef std::pair<boost::optional<lsCommandWithAny>, boost::optional<CodeAction> > Either;
+ typedef std::pair<optional<lsCommandWithAny>, optional<CodeAction> > Either;
};
diff --git a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsCommand.h b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsCommand.h
index 88ced6e41c1..2d624c3d994 100644
--- a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsCommand.h
+++ b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsCommand.h
@@ -22,7 +22,7 @@ struct lsCommand {
// Arguments to run the command with.
// **NOTE** This must be serialized as an array. Use
// MAKE_REFLECT_STRUCT_WRITER_AS_ARRAY.
- boost::optional<AnyArray> arguments;
+ optional<AnyArray> arguments;
void swap(lsCommand<AnyArray>& arg) noexcept
{
diff --git a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsFormattingOptions.h b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsFormattingOptions.h
index cc3ad4bbac1..0c3999896b3 100644
--- a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsFormattingOptions.h
+++ b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsFormattingOptions.h
@@ -4,9 +4,9 @@
struct lsFormattingOptions {
struct KeyData {
- boost::optional<bool> _boolean;
- boost::optional<int32_t> _integer;
- boost::optional<std::string> _string;
+ optional<bool> _boolean;
+ optional<int32_t> _integer;
+ optional<std::string> _string;
};
// Size of a tab in spaces.
@@ -19,22 +19,22 @@ struct lsFormattingOptions {
*
* @since 3.15.0
*/
- boost::optional<bool> trimTrailingWhitespace;
+ optional<bool> trimTrailingWhitespace;
/**
* Insert a newline character at the end of the file if one does not exist.
*
* @since 3.15.0
*/
- boost::optional<bool> insertFinalNewline;
+ optional<bool> insertFinalNewline;
/**
* Trim all newlines after the final newline at the end of the file.
*
* @since 3.15.0
*/
- boost::optional<bool> trimFinalNewlines;
- boost::optional<KeyData> key;
+ optional<bool> trimFinalNewlines;
+ optional<KeyData> key;
MAKE_SWAP_METHOD(lsFormattingOptions, tabSize, insertSpaces, trimTrailingWhitespace, insertFinalNewline, trimFinalNewlines, key)
};
MAKE_REFLECT_STRUCT(lsFormattingOptions, tabSize, insertSpaces, trimTrailingWhitespace, insertFinalNewline, trimFinalNewlines, key);
diff --git a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsMarkedString.h b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsMarkedString.h
index 975ee4fed0e..8478c055c5b 100644
--- a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsMarkedString.h
+++ b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsMarkedString.h
@@ -20,7 +20,7 @@
// Note that markdown strings will be sanitized - that means html will be
// escaped.
struct lsMarkedString {
- boost::optional<std::string> language;
+ optional<std::string> language;
std::string value;
};
diff --git a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsResponseError.h b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsResponseError.h
index 9b0120e3e46..254e76f7574 100644
--- a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsResponseError.h
+++ b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsResponseError.h
@@ -108,7 +108,7 @@ struct lsResponseError {
* A primitive or structured value that contains additional
* information about the error. Can be omitted.
*/
- boost::optional<lsp::Any> data;
+ optional<lsp::Any> data;
std::string ToString();
void Write(Writer& visitor);
diff --git a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsTextDocumentPositionParams.h b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsTextDocumentPositionParams.h
index 6f0940c0b2f..a46fa22a9e9 100644
--- a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsTextDocumentPositionParams.h
+++ b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsTextDocumentPositionParams.h
@@ -18,7 +18,7 @@ struct lsTextDocumentPositionParams {
/**
* Legacy property to support protocol version 1.0 requests.
*/
- boost::optional<lsDocumentUri> uri;
+ optional<lsDocumentUri> uri;
MAKE_SWAP_METHOD(lsTextDocumentPositionParams, textDocument, position, uri);
diff --git a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsTextEdit.h b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsTextEdit.h
index de06e85e929..29699c9c31d 100644
--- a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsTextEdit.h
+++ b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsTextEdit.h
@@ -27,13 +27,13 @@ struct lsChangeAnnotation
* A flag which indicates that user confirmation is needed
* before applying the change.
*/
- boost::optional<bool> needsConfirmation;
+ optional<bool> needsConfirmation;
/**
* A human-readable string which is rendered less prominent in
* the user interface.
*/
- boost::optional < std::string > description;
+ optional < std::string > description;
MAKE_REFLECT_STRUCT(lsChangeAnnotation, label, needsConfirmation, description)
};
MAKE_REFLECT_STRUCT(lsChangeAnnotation, label, needsConfirmation, description)
@@ -75,7 +75,7 @@ struct lsTextEdit {
/**
* The actual annotation identifier.
*/
- boost::optional<lsChangeAnnotationIdentifier> annotationId;
+ optional<lsChangeAnnotationIdentifier> annotationId;
bool operator==(const lsTextEdit& that);
diff --git a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsVersionedTextDocumentIdentifier.h b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsVersionedTextDocumentIdentifier.h
index 7e8ccbd635c..2b17a4fb0b6 100644
--- a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsVersionedTextDocumentIdentifier.h
+++ b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsVersionedTextDocumentIdentifier.h
@@ -10,7 +10,7 @@ struct lsVersionedTextDocumentIdentifier
{
lsDocumentUri uri;
// The version number of this document. number | null
- boost::optional<int> version;
+ optional<int> version;
lsTextDocumentIdentifier AsTextDocumentIdentifier() const;
diff --git a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsWorkspaceEdit.h b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsWorkspaceEdit.h
index 4df020d7a23..4caf296c28e 100644
--- a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsWorkspaceEdit.h
+++ b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsWorkspaceEdit.h
@@ -33,10 +33,10 @@ struct lsWorkspaceEdit {
// version of a text document. Whether a client supports versioned document
// edits is expressed via `WorkspaceClientCapabilites.versionedWorkspaceEdit`.
//
- boost::optional< std::map<std::string, std::vector<lsTextEdit> > > changes;
- typedef std::pair < boost::optional<lsTextDocumentEdit>, boost::optional<lsp::Any> > Either;
+ optional< std::map<std::string, std::vector<lsTextEdit> > > changes;
+ typedef std::pair < optional<lsTextDocumentEdit>, optional<lsp::Any> > Either;
- boost::optional < std::vector< Either > > documentChanges;
+ optional < std::vector< Either > > documentChanges;
/**
* A map of change annotations that can be referenced in
* `AnnotatedTextEdit`s or create, rename and delete file / folder
@@ -47,7 +47,7 @@ struct lsWorkspaceEdit {
*
* @since 3.16.0
*/
- boost::optional< lsChangeAnnotations > changeAnnotations;
+ optional< lsChangeAnnotations > changeAnnotations;
MAKE_SWAP_METHOD(lsWorkspaceEdit, changes, documentChanges, changeAnnotations)
};
diff --git a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsp_completion.h b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsp_completion.h
index d434b31d130..fca45e9cb7f 100644
--- a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsp_completion.h
+++ b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsp_completion.h
@@ -75,20 +75,20 @@ struct lsCompletionItem {
// The kind of this completion item. Based of the kind
// an icon is chosen by the editor.
- boost::optional<lsCompletionItemKind> kind ;
+ optional<lsCompletionItemKind> kind ;
// A human-readable string with additional information
// about this item, like type or symbol information.
- boost::optional < std::string > detail;
+ optional < std::string > detail;
// A human-readable string that represents a doc-comment.
- boost::optional< std::pair<boost::optional< std::string> , boost::optional<MarkupContent> > > documentation;
+ optional< std::pair<optional< std::string> , optional<MarkupContent> > > documentation;
/**
* Indicates if this item is deprecated.
*/
- boost::optional< bool >deprecated;
+ optional< bool >deprecated;
/**
@@ -98,7 +98,7 @@ struct lsCompletionItem {
* tool / client decides which item that is. The rule is that the *first
* item of those that match best is selected.
*/
- boost::optional< bool > preselect;
+ optional< bool > preselect;
// Internal information to order candidates.
@@ -106,33 +106,33 @@ struct lsCompletionItem {
// A string that shoud be used when comparing this item
// with other items. When `falsy` the label is used.
- boost::optional< std::string > sortText;
+ optional< std::string > sortText;
// A string that should be used when filtering a set of
// completion items. When `falsy` the label is used.
- boost::optional<std::string> filterText;
+ optional<std::string> filterText;
// A string that should be inserted a document when selecting
// this completion. When `falsy` the label is used.
- boost::optional<std::string> insertText;
+ optional<std::string> insertText;
// The format of the insert text. The format applies to both the `insertText`
// property and the `newText` property of a provided `textEdit`.
- boost::optional< lsInsertTextFormat> insertTextFormat ;
+ optional< lsInsertTextFormat> insertTextFormat ;
// An edit which is applied to a document when selecting this completion. When
// an edit is provided the value of `insertText` is ignored.
//
// *Note:* The range of the edit must be a single line range and it must
// contain the position at which completion has been requested.
- boost::optional<lsTextEdit> textEdit;
+ optional<lsTextEdit> textEdit;
- // An boost::optional array of additional text edits that are applied when
+ // An optional array of additional text edits that are applied when
// selecting this completion. Edits must not overlap with the main edit
// nor with themselves.
// std::vector<TextEdit> additionalTextEdits;
- // An boost::optional command that is executed *after* inserting this completion.
+ // An optional command that is executed *after* inserting this completion.
// *Note* that additional modifications to the current document should be
// described with the additionalTextEdits-property. Command command;
@@ -147,7 +147,7 @@ struct lsCompletionItem {
std::string DisplayText();
/**
- * An boost::optional array of additional text edits that are applied when
+ * An optional array of additional text edits that are applied when
* selecting this completion. Edits must not overlap (including the same insert position)
* with the main edit nor with themselves.
*
@@ -155,26 +155,26 @@ struct lsCompletionItem {
* (for example adding an import statement at the top of the file if the completion item will
* insert an unqualified type).
*/
- boost::optional<std::vector<lsTextEdit> >additionalTextEdits;
+ optional<std::vector<lsTextEdit> >additionalTextEdits;
/**
-* An boost::optional set of characters that when pressed while this completion is active will accept it first and
+* An optional set of characters that when pressed while this completion is active will accept it first and
* then type that character. *Note* that all commit characters should have `length=1` and that superfluous
* characters will be ignored.
*/
- boost::optional< std::vector<std::string> > commitCharacters;
+ optional< std::vector<std::string> > commitCharacters;
/**
-* An boost::optional command that is executed *after* inserting this completion. *Note* that
+* An optional command that is executed *after* inserting this completion. *Note* that
* additional modifications to the current document should be described with the
* additionalTextEdits-property.
*/
- boost::optional<lsCommandWithAny> command;
+ optional<lsCommandWithAny> command;
/**
* An data entry field that is preserved on a completion item between a completion and a completion resolve request.
*/
- boost::optional<lsp::Any> data;
+ optional<lsp::Any> data;
std::string ToString();
MAKE_SWAP_METHOD(lsCompletionItem,
label,
diff --git a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsp_diagnostic.h b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsp_diagnostic.h
index 3ddea4b9ee9..e05e816b697 100644
--- a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsp_diagnostic.h
+++ b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/lsp_diagnostic.h
@@ -1,4 +1,5 @@
#pragma once
+#include <optional>
#include "lsRange.h"
#include "lsTextEdit.h"
#include "lsDocumentUri.h"
@@ -92,15 +93,15 @@ struct lsDiagnostic {
// The diagnostic's severity. Can be omitted. If omitted it is up to the
// client to interpret diagnostics as error, warning, info or hint.
- boost::optional<lsDiagnosticSeverity> severity;
+ optional<lsDiagnosticSeverity> severity;
// The diagnostic's code. Can be omitted.
- boost::optional< std::pair<boost::optional<std::string>, boost::optional<int>> > code;
+ optional< std::pair<optional<std::string>, optional<int>> > code;
- boost::optional<DiagnosticCodeDescription> codeDescription;
+ optional<DiagnosticCodeDescription> codeDescription;
// A human-readable string describing the source of this
// diagnostic, e.g. 'typescript' or 'super lint'.
- boost::optional < std::string >source ;
+ optional < std::string >source ;
// The diagnostic's message.
std::string message;
@@ -113,7 +114,7 @@ struct lsDiagnostic {
*
* @since 3.15.0
*/
- boost::optional<std::vector<DiagnosticTag>> tags;
+ optional<std::vector<DiagnosticTag>> tags;
/**
@@ -122,7 +123,7 @@ struct lsDiagnostic {
*
* Since 3.7.0
*/
- boost::optional<std::vector<DiagnosticRelatedInformation>> relatedInformation;
+ optional<std::vector<DiagnosticRelatedInformation>> relatedInformation;
/**
* A data entry field that is preserved between a
@@ -131,7 +132,7 @@ struct lsDiagnostic {
*
* @since 3.16.0
*/
- boost::optional<lsp::Any> data;
+ optional<lsp::Any> data;
bool operator==(const lsDiagnostic& rhs) const;
bool operator!=(const lsDiagnostic& rhs) const;
diff --git a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/out_list.h b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/out_list.h
index 60f8ba3c7f7..8ede0b4a60b 100644
--- a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/out_list.h
+++ b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/out_list.h
@@ -15,7 +15,7 @@
namespace LocationListEither{
- typedef std::pair< boost::optional<std::vector<lsLocation>> , boost::optional<std::vector<LocationLink> > > Either;
+ typedef std::pair< optional<std::vector<lsLocation>> , optional<std::vector<LocationLink> > > Either;
};
extern void Reflect(Reader& visitor, LocationListEither::Either& value);
diff --git a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/symbol.h b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/symbol.h
index 87ebfe89ed8..216c3f7d134 100644
--- a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/symbol.h
+++ b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/symbol.h
@@ -66,7 +66,7 @@ struct lsDocumentHighlight {
lsRange range;
// The highlight kind, default is DocumentHighlightKind.Text.
- boost::optional<lsDocumentHighlightKind> kind ;
+ optional<lsDocumentHighlightKind> kind ;
MAKE_SWAP_METHOD(lsDocumentHighlight, range, kind)
};
@@ -85,7 +85,7 @@ struct lsSymbolInformation {
/**
* Indicates if this symbol is deprecated.
*/
- boost::optional<bool> deprecated;
+ optional<bool> deprecated;
/**
* The location of this symbol. The location's range is used by a tool
* to reveal the location in the editor. If the symbol is selected in the
@@ -104,7 +104,7 @@ struct lsSymbolInformation {
* if necessary). It can't be used to re-infer a hierarchy for the document
* symbols.
*/
- boost::optional<std::string> containerName;
+ optional<std::string> containerName;
MAKE_SWAP_METHOD(lsSymbolInformation, name, kind, deprecated, location, containerName);
@@ -144,17 +144,17 @@ struct lsDocumentSymbol {
* More detail for this symbol, e.g the signature of a function. If not provided the
* name is used.
*/
- boost::optional< std::string > detail;
+ optional< std::string > detail;
/**
* Indicates if this symbol is deprecated.
*/
- boost::optional< bool > deprecated;
+ optional< bool > deprecated;
/**
* Children of this symbol, e.g. properties of a class.
*/
- boost::optional < std::vector<lsDocumentSymbol> > children;
+ optional < std::vector<lsDocumentSymbol> > children;
//internal use
int flags=0;
diff --git a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/SemanticTokens.h b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/SemanticTokens.h
index 7f5978ff84f..8a24ebdd45a 100644
--- a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/SemanticTokens.h
+++ b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/SemanticTokens.h
@@ -199,7 +199,7 @@ struct SemanticTokens{
* A server can then instead of computing all semantic tokens again simply
* send a delta.
*/
- boost::optional<std::string> resultId;
+ optional<std::string> resultId;
MAKE_SWAP_METHOD(SemanticTokens, data, resultId)
};
MAKE_REFLECT_STRUCT(SemanticTokens, data, resultId)
@@ -245,12 +245,12 @@ MAKE_REFLECT_STRUCT(SemanticTokensEdit, startToken, deleteTokens, tokens)
/// This models LSP SemanticTokensDelta | SemanticTokens, which is the result of
/// textDocument/semanticTokens/full/delta.
struct SemanticTokensOrDelta {
- boost::optional<std::string > resultId;
+ optional<std::string > resultId;
/// Set if we computed edits relative to a previous set of tokens.
- boost::optional< std::vector<SemanticTokensEdit> > edits;
+ optional< std::vector<SemanticTokensEdit> > edits;
/// Set if we computed a fresh set of tokens.
/// Set if we computed edits relative to a previous set of tokens.
- boost::optional<std::vector<int32_t>> tokens; // encoded as integer array
+ optional<std::vector<int32_t>> tokens; // encoded as integer array
MAKE_REFLECT_STRUCT(SemanticTokensOrDelta, resultId, edits, tokens)
};
MAKE_REFLECT_STRUCT(SemanticTokensOrDelta, resultId, edits, tokens)
@@ -263,5 +263,5 @@ struct SemanticTokensLegend {
};
MAKE_REFLECT_STRUCT(SemanticTokensLegend, tokenTypes, tokenModifiers)
-DEFINE_REQUEST_RESPONSE_TYPE(td_semanticTokens_full, SemanticTokensParams,boost::optional<SemanticTokens >,"textDocument/semanticTokens/full")
-DEFINE_REQUEST_RESPONSE_TYPE(td_semanticTokens_full_delta, SemanticTokensDeltaParams, boost::optional<SemanticTokensOrDelta >, "textDocument/semanticTokens/full/delta")
+DEFINE_REQUEST_RESPONSE_TYPE(td_semanticTokens_full, SemanticTokensParams,optional<SemanticTokens >,"textDocument/semanticTokens/full")
+DEFINE_REQUEST_RESPONSE_TYPE(td_semanticTokens_full_delta, SemanticTokensDeltaParams, optional<SemanticTokensOrDelta >, "textDocument/semanticTokens/full/delta")
diff --git a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/callHierarchy.h b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/callHierarchy.h
index 432fa518d59..408767d937c 100644
--- a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/callHierarchy.h
+++ b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/callHierarchy.h
@@ -35,10 +35,10 @@ struct CallHierarchyItem {
SymbolKind kind;
/// Tags for this item.
- boost::optional<std::vector<SymbolTag>> tags;
+ optional<std::vector<SymbolTag>> tags;
/// More detaill for this item, e.g. the signature of a function.
- boost::optional<std::string> detail;
+ optional<std::string> detail;
/// The resource identifier of this item.
lsDocumentUri uri;
@@ -60,7 +60,7 @@ struct CallHierarchyItem {
* A data entry field that is preserved between a call hierarchy prepare and
* incoming calls or outgoing calls requests.
*/
- boost::optional<lsp::Any> data;
+ optional<lsp::Any> data;
MAKE_SWAP_METHOD(CallHierarchyItem, name, kind, tags, detail, uri, range, selectionRange, data)
};
MAKE_REFLECT_STRUCT(CallHierarchyItem, name, kind, tags, detail, uri, range, selectionRange, data)
@@ -112,10 +112,10 @@ MAKE_REFLECT_STRUCT(CallHierarchyOutgoingCall, to, fromRanges)
DEFINE_REQUEST_RESPONSE_TYPE(td_prepareCallHierarchy, CallHierarchyPrepareParams,
- boost::optional<std::vector<CallHierarchyItem>>, "textDocument/prepareCallHierarchy")
+ optional<std::vector<CallHierarchyItem>>, "textDocument/prepareCallHierarchy")
DEFINE_REQUEST_RESPONSE_TYPE(td_incomingCalls, CallHierarchyIncomingCallsParams,
- boost::optional<std::vector<CallHierarchyIncomingCall>>, "callHierarchy/incomingCalls")
+ optional<std::vector<CallHierarchyIncomingCall>>, "callHierarchy/incomingCalls")
DEFINE_REQUEST_RESPONSE_TYPE(td_outgoingCalls, CallHierarchyOutgoingCallsParams,
- boost::optional<std::vector<CallHierarchyOutgoingCall>>, "callHierarchy/CallHierarchyOutgoingCall")
+ optional<std::vector<CallHierarchyOutgoingCall>>, "callHierarchy/CallHierarchyOutgoingCall")
diff --git a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/code_lens.h b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/code_lens.h
index 9dd763333d8..b9241de06bc 100644
--- a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/code_lens.h
+++ b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/code_lens.h
@@ -21,10 +21,10 @@ struct lsCodeLens {
// The range in which this code lens is valid. Should only span a single line.
lsRange range;
// The command this code lens represents.
- boost::optional<lsCommandWithAny> command;
+ optional<lsCommandWithAny> command;
// A data entry field that is preserved on a code lens item between
// a code lens and a code lens resolve request.
- boost::optional< lsp::Any> data;
+ optional< lsp::Any> data;
MAKE_SWAP_METHOD(lsCodeLens, range, command, data)
};
diff --git a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/completion.h b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/completion.h
index 916d4550e93..edcf1e17240 100644
--- a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/completion.h
+++ b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/completion.h
@@ -30,7 +30,7 @@ struct lsCompletionContext {
// The trigger character (a single character) that has trigger code complete.
// Is undefined if `triggerKind !== CompletionTriggerKind.TriggerCharacter`
- boost::optional<std::string> triggerCharacter;
+ optional<std::string> triggerCharacter;
MAKE_SWAP_METHOD(lsCompletionContext, triggerKind, triggerCharacter);
};
@@ -40,7 +40,7 @@ struct lsCompletionParams : lsTextDocumentPositionParams {
// The completion context. This is only available it the client specifies to
// send this using
// `ClientCapabilities.textDocument.completion.contextSupport === true`
- boost::optional<lsCompletionContext> context;
+ optional<lsCompletionContext> context;
MAKE_SWAP_METHOD(lsCompletionParams, textDocument, position, context);
@@ -57,7 +57,7 @@ MAKE_REFLECT_STRUCT(lsCompletionParams, textDocument, position, context);
namespace TextDocumentComplete{
- typedef std::pair< boost::optional<std::vector<lsCompletionItem>>, boost::optional<CompletionList> > Either;
+ typedef std::pair< optional<std::vector<lsCompletionItem>>, optional<CompletionList> > Either;
};
extern void Reflect(Reader& visitor, TextDocumentComplete::Either& value);
diff --git a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/didRenameFiles.h b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/didRenameFiles.h
index a7c6fdba346..d88d0e1307d 100644
--- a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/didRenameFiles.h
+++ b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/didRenameFiles.h
@@ -38,7 +38,7 @@ public:
MAKE_REFLECT_STRUCT(FileRenameParams, files);
-DEFINE_REQUEST_RESPONSE_TYPE(td_didRenameFiles, FileRenameParams, boost::optional<lsWorkspaceEdit>, "java/didRenameFiles");
+DEFINE_REQUEST_RESPONSE_TYPE(td_didRenameFiles, FileRenameParams, optional<lsWorkspaceEdit>, "java/didRenameFiles");
-DEFINE_REQUEST_RESPONSE_TYPE(td_willRenameFiles, FileRenameParams, boost::optional<lsWorkspaceEdit>, "java/willRenameFiles");
+DEFINE_REQUEST_RESPONSE_TYPE(td_willRenameFiles, FileRenameParams, optional<lsWorkspaceEdit>, "java/willRenameFiles");
diff --git a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/did_change.h b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/did_change.h
index fda407f93fb..8450bd343a2 100644
--- a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/did_change.h
+++ b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/did_change.h
@@ -9,9 +9,9 @@
#include "LibLsp/lsp/lsDocumentUri.h"
struct lsTextDocumentContentChangeEvent {
// The range of the document that changed.
- boost::optional<lsRange> range;
+ optional<lsRange> range;
// The length of the range that got replaced.
- boost::optional<int> rangeLength;
+ optional<int> rangeLength;
// The new text of the range/document.
std::string text;
@@ -28,7 +28,7 @@ struct lsTextDocumentDidChangeParams {
* Legacy property to support protocol version 1.0 requests.
*/
- boost::optional<lsDocumentUri> uri;
+ optional<lsDocumentUri> uri;
void swap(lsTextDocumentDidChangeParams& arg) noexcept
{
diff --git a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/did_open.h b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/did_open.h
index ed5dfa535f0..379f35989ff 100644
--- a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/did_open.h
+++ b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/did_open.h
@@ -16,7 +16,7 @@ namespace TextDocumentDidOpen {
/**
* Legacy property to support protocol version 1.0 requests.
*/
- boost::optional<std::string> text;
+ optional<std::string> text;
MAKE_SWAP_METHOD(TextDocumentDidOpen::Params, textDocument, text);
diff --git a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/did_save.h b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/did_save.h
index 649c9b76ec9..5d00af0c203 100644
--- a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/did_save.h
+++ b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/did_save.h
@@ -13,7 +13,7 @@ namespace TextDocumentDidSave {
// Optional the content when saved. Depends on the includeText value
// when the save notifcation was requested.
- boost::optional<std::string> text;
+ optional<std::string> text;
MAKE_SWAP_METHOD(TextDocumentDidSave::Params, textDocument, text);
};
diff --git a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/document_link.h b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/document_link.h
index e450a08df1c..92f02b24f12 100644
--- a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/document_link.h
+++ b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/document_link.h
@@ -24,9 +24,9 @@ struct lsDocumentLink {
// The range this link applies to.
lsRange range;
// The uri this link points to. If missing a resolve request is sent later.
- boost::optional<lsDocumentUri> target;
+ optional<lsDocumentUri> target;
- boost::optional<lsp::Any> data;
+ optional<lsp::Any> data;
MAKE_SWAP_METHOD(lsDocumentLink, range, target, data)
@@ -34,11 +34,11 @@ struct lsDocumentLink {
MAKE_REFLECT_STRUCT(lsDocumentLink, range, target,data);
-DEFINE_REQUEST_RESPONSE_TYPE(td_links, TextDocumentDocumentLink::Params, lsDocumentLink, "textDocument/documentLink");
+DEFINE_REQUEST_RESPONSE_TYPE(td_links, TextDocumentDocumentLink::Params, std::vector<lsDocumentLink>, "textDocument/documentLink");
/**
* The document link resolve request is sent from the client to the server to resolve the target of a given document link.
*/
-DEFINE_REQUEST_RESPONSE_TYPE(td_linkResolve, std::vector<lsDocumentLink>, lsDocumentLink, "documentLink/resolve");
+DEFINE_REQUEST_RESPONSE_TYPE(td_linkResolve, lsDocumentLink, lsDocumentLink, "documentLink/resolve");
diff --git a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/document_symbol.h b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/document_symbol.h
index 150dde1f0bf..b01ffe0dc74 100644
--- a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/document_symbol.h
+++ b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/document_symbol.h
@@ -18,7 +18,7 @@ MAKE_REFLECT_STRUCT(lsDocumentSymbolParams, textDocument);
struct TextDocumentDocumentSymbol{
- typedef std::pair< boost::optional<lsSymbolInformation> , boost::optional<lsDocumentSymbol> > Either;
+ typedef std::pair< optional<lsSymbolInformation> , optional<lsDocumentSymbol> > Either;
};
void Reflect(Reader& visitor, TextDocumentDocumentSymbol::Either& value);
diff --git a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/hover.h b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/hover.h
index 06f3f9613e9..f2c15c3c44a 100644
--- a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/hover.h
+++ b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/hover.h
@@ -16,8 +16,8 @@
namespace TextDocumentHover
{
- typedef boost::optional< std::vector< std::pair<boost::optional<std::string>, boost::optional<lsMarkedString>> > > Left;
- typedef std::pair< Left, boost::optional<MarkupContent> > Either;
+ typedef optional< std::vector< std::pair<optional<std::string>, optional<lsMarkedString>> > > Left;
+ typedef std::pair< Left, optional<MarkupContent> > Either;
struct Result {
/**
* The hover's content as markdown
@@ -25,16 +25,16 @@ namespace TextDocumentHover
Either contents;
/**
- * An boost::optional range
+ * An optional range
*/
- boost::optional<lsRange> range;
+ optional<lsRange> range;
MAKE_SWAP_METHOD(Result, contents, range)
};
}
MAKE_REFLECT_STRUCT(TextDocumentHover::Result, contents, range);
-extern void Reflect(Reader& visitor, std::pair<boost::optional<std::string>, boost::optional<lsMarkedString>>& value);
+extern void Reflect(Reader& visitor, std::pair<optional<std::string>, optional<lsMarkedString>>& value);
extern void Reflect(Reader& visitor, TextDocumentHover::Either& value);
diff --git a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/linkedEditingRange.h b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/linkedEditingRange.h
index 96e938a89f3..dfac99d378f 100644
--- a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/linkedEditingRange.h
+++ b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/linkedEditingRange.h
@@ -38,7 +38,7 @@ struct LinkedEditingRanges
* pattern will be used.
*/
- boost::optional<std::string> wordPattern;
+ optional<std::string> wordPattern;
MAKE_SWAP_METHOD(LinkedEditingRanges,
ranges,
wordPattern)
@@ -48,4 +48,4 @@ MAKE_REFLECT_STRUCT(LinkedEditingRanges,
ranges,
wordPattern)
DEFINE_REQUEST_RESPONSE_TYPE(td_linkedEditingRange, LinkedEditingRangeParams,
- boost::optional<std::vector<LinkedEditingRanges >>,"textDocument/linkedEditingRange")
+ optional<std::vector<LinkedEditingRanges >>,"textDocument/linkedEditingRange")
diff --git a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/prepareRename.h b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/prepareRename.h
index a7ece38114d..1ffe5456f70 100644
--- a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/prepareRename.h
+++ b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/prepareRename.h
@@ -32,7 +32,7 @@ MAKE_REFLECT_STRUCT(PrepareRenameResult,range,placeholder)
-typedef std::pair< boost::optional< lsRange>, boost::optional<PrepareRenameResult>> TextDocumentPrepareRenameResult;
+typedef std::pair< optional< lsRange>, optional<PrepareRenameResult>> TextDocumentPrepareRenameResult;
extern void Reflect(Reader& visitor, TextDocumentPrepareRenameResult& value);
diff --git a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/references.h b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/references.h
index f398a0b8597..46782c3d6dc 100644
--- a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/references.h
+++ b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/references.h
@@ -11,7 +11,7 @@ namespace TextDocumentReferences {
struct lsReferenceContext {
// Include the declaration of the current symbol.
- boost::optional<bool> includeDeclaration;
+ optional<bool> includeDeclaration;
MAKE_REFLECT_STRUCT(lsReferenceContext,
includeDeclaration)
};
diff --git a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/resolveTypeHierarchy.h b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/resolveTypeHierarchy.h
index dceba1fb8ff..8b5f115af7a 100644
--- a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/resolveTypeHierarchy.h
+++ b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/resolveTypeHierarchy.h
@@ -18,7 +18,7 @@ struct ResolveTypeHierarchyItemParams {
/**
* The number of hierarchy levels to resolve. {@code 0} indicates no hierarchy level.
*/
- boost::optional<int> resolve;
+ optional<int> resolve;
/**
* The direction of the type hierarchy resolution.
diff --git a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/selectionRange.h b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/selectionRange.h
index 91915275bdf..2c908bd57f7 100644
--- a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/selectionRange.h
+++ b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/selectionRange.h
@@ -35,11 +35,11 @@ struct SelectionRange {
/**
* The parent selection range containing this range. Therefore `parent.range` must contain `this.range`.
*/
- boost::optional<SelectionRange*> parent;
+ optional<SelectionRange*> parent;
MAKE_SWAP_METHOD(SelectionRange, range, parent)
};
-extern void Reflect(Reader& visitor, boost::optional<SelectionRange*>& value);
+extern void Reflect(Reader& visitor, optional<SelectionRange*>& value);
extern void Reflect(Writer& visitor, SelectionRange* value);
MAKE_REFLECT_STRUCT(SelectionRange,range,parent)
diff --git a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/signature_help.h b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/signature_help.h
index 837096695e8..bb5cd1dc522 100644
--- a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/signature_help.h
+++ b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/signature_help.h
@@ -7,7 +7,7 @@
#include "LibLsp/lsp/lsTextDocumentPositionParams.h"
extern void Reflect(Reader& visitor,
- std::pair<boost::optional<std::string>, boost::optional<MarkupContent>>& value);
+ std::pair<optional<std::string>, optional<MarkupContent>>& value);
@@ -20,7 +20,7 @@ struct lsParameterInformation {
// The human-readable doc-comment of this parameter. Will be shown
// in the UI but can be omitted.
- boost::optional< std::pair< boost::optional<std::string> , boost::optional <MarkupContent> > > documentation;
+ optional< std::pair< optional<std::string> , optional <MarkupContent> > > documentation;
MAKE_SWAP_METHOD(lsParameterInformation, label, documentation)
};
@@ -36,7 +36,7 @@ struct lsSignatureInformation {
// The human-readable doc-comment of this signature. Will be shown
// in the UI but can be omitted.
- boost::optional< std::pair< boost::optional<std::string>, boost::optional <MarkupContent> > > documentation;
+ optional< std::pair< optional<std::string>, optional <MarkupContent> > > documentation;
// The parameters of this signature.
std::vector<lsParameterInformation> parameters;
@@ -59,7 +59,7 @@ struct lsSignatureHelp {
// rely on a default value.
// In future version of the protocol this property might become
// mandantory to better express this.
- boost::optional<int> activeSignature;
+ optional<int> activeSignature;
// The active parameter of the active signature. If omitted or the value
// lies outside the range of `signatures[activeSignature].parameters`
@@ -68,7 +68,7 @@ struct lsSignatureHelp {
// In future version of the protocol this property might become
// mandantory to better express the active parameter if the
// active signature does have any.
- boost::optional<int> activeParameter;
+ optional<int> activeParameter;
MAKE_SWAP_METHOD(lsSignatureHelp,
diff --git a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/typeHierarchy.h b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/typeHierarchy.h
index 384cfb68c94..8fe99edd879 100644
--- a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/typeHierarchy.h
+++ b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/typeHierarchy.h
@@ -42,8 +42,8 @@ void Reflect(Writer& writer, TypeHierarchyDirection& value);
struct TypeHierarchyParams :public lsTextDocumentPositionParams
{
- boost::optional<int> resolve;
- boost::optional<TypeHierarchyDirection> direction ;
+ optional<int> resolve;
+ optional<TypeHierarchyDirection> direction ;
MAKE_SWAP_METHOD(TypeHierarchyParams, textDocument, position, resolve, direction)
};
@@ -67,7 +67,7 @@ struct TypeHierarchyItem {
/**
* Optional detail for the hierarchy item. It can be, for instance, the signature of a function or method.
*/
- boost::optional<std::string>
+ optional<std::string>
detail;
/**
@@ -80,7 +80,7 @@ struct TypeHierarchyItem {
* {@code true} if the hierarchy item is deprecated. Otherwise, {@code false}. It is {@code false} by default.
*/
- boost::optional<bool> deprecated;
+ optional<bool> deprecated;
/**
* The URI of the text document where this type hierarchy item belongs to.
@@ -111,18 +111,18 @@ struct TypeHierarchyItem {
* If this type hierarchy item is resolved, it contains the direct parents. Could be empty if the item does not have any
* direct parents. If not defined, the parents have not been resolved yet.
*/
- boost::optional< std::vector<TypeHierarchyItem> > parents;
+ optional< std::vector<TypeHierarchyItem> > parents;
/**
* If this type hierarchy item is resolved, it contains the direct children of the current item.
* Could be empty if the item does not have any descendants. If not defined, the children have not been resolved.
*/
- boost::optional< std::vector<TypeHierarchyItem> > children;
+ optional< std::vector<TypeHierarchyItem> > children;
/**
- * An boost::optional data field can be used to identify a type hierarchy item in a resolve request.
+ * An optional data field can be used to identify a type hierarchy item in a resolve request.
*/
- boost::optional<lsp::Any> data;
+ optional<lsp::Any> data;
MAKE_SWAP_METHOD(TypeHierarchyItem, name, detail, kind, deprecated, uri, range, selectionRange, parents, children, data)
};
diff --git a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/willSave.h b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/willSave.h
index 29afcac41a4..4fe33d1dcc6 100644
--- a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/willSave.h
+++ b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/textDocument/willSave.h
@@ -40,7 +40,7 @@ namespace WillSaveTextDocumentParams {
* A reason why a text document is saved.
*/
- boost::optional<TextDocumentSaveReason> reason;
+ optional<TextDocumentSaveReason> reason;
MAKE_SWAP_METHOD(Params, textDocument, reason);
};
diff --git a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/utils.h b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/utils.h
index 95064c34d63..5f1769f80a8 100644
--- a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/utils.h
+++ b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/utils.h
@@ -7,7 +7,7 @@
#include <memory>
#include <string>
#include <vector>
-#include <boost/optional/optional.hpp>
+#include <optional>
#include <LibLsp/lsp/AbsolutePath.h>
#include "lsPosition.h"
@@ -80,7 +80,7 @@ std::string EscapeFileName(std::string path);
// FIXME: Move ReadContent into ICacheManager?
bool FileExists(const std::string& filename);
-boost::optional<std::string> ReadContent(const AbsolutePath& filename);
+optional<std::string> ReadContent(const AbsolutePath& filename);
std::vector<std::string> ReadLinesWithEnding(const AbsolutePath& filename);
bool WriteToFile(const std::string& filename, const std::string& content);
diff --git a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/workspace/applyEdit.h b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/workspace/applyEdit.h
index d1d4bc85dfb..eb1f250b2f3 100644
--- a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/workspace/applyEdit.h
+++ b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/workspace/applyEdit.h
@@ -33,7 +33,7 @@ MAKE_REFLECT_STRUCT(ApplyWorkspaceEditParams, edit, label);
struct ApplyWorkspaceEditResponse
{
bool applied;
- boost::optional<std::string> failureReason;
+ optional<std::string> failureReason;
MAKE_SWAP_METHOD(ApplyWorkspaceEditResponse, applied, failureReason)
};
MAKE_REFLECT_STRUCT(ApplyWorkspaceEditResponse, applied, failureReason);
diff --git a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/workspace/workspaceFolders.h b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/workspace/workspaceFolders.h
index 1ba33b501cf..136c1d777b5 100644
--- a/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/workspace/workspaceFolders.h
+++ b/Build/source/utils/asymptote/LspCpp/include/LibLsp/lsp/workspace/workspaceFolders.h
@@ -30,5 +30,5 @@ MAKE_REFLECT_STRUCT(WorkspaceFolder, uri, name);
* the workspace folders otherwise.
*/
DEFINE_REQUEST_RESPONSE_TYPE(WorkspaceFolders,
- boost::optional<JsonNull>, boost::optional<std::vector< WorkspaceFolder>>, "workspace/workspaceFolders");
+ optional<JsonNull>, optional<std::vector< WorkspaceFolder>>, "workspace/workspaceFolders");
diff --git a/Build/source/utils/asymptote/LspCpp/src/jsonrpc/GCThreadContext.cpp b/Build/source/utils/asymptote/LspCpp/src/jsonrpc/GCThreadContext.cpp
index f1420e964be..8b68d329c9e 100755
--- a/Build/source/utils/asymptote/LspCpp/src/jsonrpc/GCThreadContext.cpp
+++ b/Build/source/utils/asymptote/LspCpp/src/jsonrpc/GCThreadContext.cpp
@@ -3,7 +3,7 @@
GCThreadContext::GCThreadContext()
{
-#ifdef USEGC
+#ifdef LSPCPP_USEGC
GC_get_stack_base(&gsb);
GC_register_my_thread(&gsb);
#endif
@@ -11,7 +11,7 @@ GCThreadContext::GCThreadContext()
GCThreadContext::~GCThreadContext()
{
-#ifdef USEGC
+#ifdef LSPCPP_USEGC
GC_unregister_my_thread();
#endif
} \ No newline at end of file
diff --git a/Build/source/utils/asymptote/LspCpp/src/jsonrpc/RemoteEndPoint.cpp b/Build/source/utils/asymptote/LspCpp/src/jsonrpc/RemoteEndPoint.cpp
index e8bdc073f37..f4bd83aae97 100755
--- a/Build/source/utils/asymptote/LspCpp/src/jsonrpc/RemoteEndPoint.cpp
+++ b/Build/source/utils/asymptote/LspCpp/src/jsonrpc/RemoteEndPoint.cpp
@@ -11,13 +11,15 @@
#include "LibLsp/JsonRpc/Context.h"
#include "rapidjson/error/en.h"
#include "LibLsp/JsonRpc/json.h"
-#include "LibLsp/JsonRpc/GCThreadContext.h"
#include "LibLsp/JsonRpc/ScopeExit.h"
#include "LibLsp/JsonRpc/stream.h"
#include <atomic>
+#include <optional>
#include <boost/asio/thread_pool.hpp>
#include <boost/asio/post.hpp>
+#include "LibLsp/JsonRpc/GCThreadContext.h"
+
namespace lsp {
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
@@ -103,7 +105,7 @@ namespace lsp {
/// (If the context is within multiple nested tasks, true if any are cancelled).
/// Always zero if there is no active cancelable task.
/// This isn't free (context lookup) - don't call it in a tight loop.
- boost::optional<CancelMonitor> getCancelledMonitor(const lsRequestId& id, const Context& ctx = Context::current()){
+ optional<CancelMonitor> getCancelledMonitor(const lsRequestId& id, const Context& ctx = Context::current()){
for (const CancelState* state = ctx.get(g_stateKey); state != nullptr;
state = state->parent)
{
@@ -143,14 +145,18 @@ PendingRequestInfo::PendingRequestInfo(const std::string& md) : method(md)
}
struct RemoteEndPoint::Data
{
- explicit Data(uint8_t workers,lsp::Log& _log , RemoteEndPoint* owner)
- : max_workers(workers), m_id(0),next_request_cookie(0), message_producer(new StreamMessageProducer(*owner)), log(_log)
+ explicit Data(lsp::JSONStreamStyle style,uint8_t workers,lsp::Log& _log , RemoteEndPoint* owner)
+ : max_workers(workers), m_id(0),next_request_cookie(0), log(_log)
{
-
+ if(style == lsp::JSONStreamStyle::Standard )
+ message_producer = (new LSPStreamMessageProducer(*owner)) ;
+ else{
+ message_producer = (new DelimitedStreamMessageProducer(*owner)) ;
+ }
}
~Data()
{
- delete message_producer;
+ delete message_producer;
}
uint8_t max_workers;
std::atomic<int> m_id;
@@ -332,8 +338,9 @@ CancelMonitor RemoteEndPoint::getCancelMonitor(const lsRequestId& id)
}
RemoteEndPoint::RemoteEndPoint(
- const std::shared_ptr < MessageJsonHandler >& json_handler,const std::shared_ptr < Endpoint>& localEndPoint, lsp::Log& _log, uint8_t max_workers):
- d_ptr(new Data(max_workers,_log,this)),jsonHandler(json_handler), local_endpoint(localEndPoint)
+ const std::shared_ptr < MessageJsonHandler >& json_handler,const std::shared_ptr < Endpoint>& localEndPoint,
+ lsp::Log& _log, lsp::JSONStreamStyle style, uint8_t max_workers):
+ d_ptr(new Data(style,max_workers,_log,this)),jsonHandler(json_handler), local_endpoint(localEndPoint)
{
jsonHandler->method2notification[Notify_Cancellation::notify::kMethodInfo] = [](Reader& visitor)
{
@@ -341,7 +348,6 @@ RemoteEndPoint::RemoteEndPoint(
};
d_ptr->quit.store(false, std::memory_order_relaxed);
-
}
RemoteEndPoint::~RemoteEndPoint()
@@ -607,7 +613,7 @@ void RemoteEndPoint::startProcessingMessages(std::shared_ptr<lsp::istream> r,
const auto temp = std::make_shared<std::string>(std::move(content));
boost::asio::post(*d_ptr->tp,
[this, temp]{
-#ifdef USEGC
+#ifdef LSPCPP_USEGC
GCThreadContext gcContext;
#endif
diff --git a/Build/source/utils/asymptote/LspCpp/src/jsonrpc/StreamMessageProducer.cpp b/Build/source/utils/asymptote/LspCpp/src/jsonrpc/StreamMessageProducer.cpp
index cc14d620762..695c35fe1dc 100755
--- a/Build/source/utils/asymptote/LspCpp/src/jsonrpc/StreamMessageProducer.cpp
+++ b/Build/source/utils/asymptote/LspCpp/src/jsonrpc/StreamMessageProducer.cpp
@@ -3,6 +3,7 @@
#include <cassert>
#include "LibLsp/JsonRpc/stream.h"
+#include "LibLsp/lsp/Markup/string_ref.h"
bool StartsWith(std::string value, std::string start);
@@ -23,7 +24,7 @@ namespace
}
- void StreamMessageProducer::parseHeader(std::string& line, StreamMessageProducer::Headers& headers)
+ void LSPStreamMessageProducer::parseHeader(std::string& line, LSPStreamMessageProducer::Headers& headers)
{
int sepIndex = line.find(':');
if (sepIndex >= 0) {
@@ -42,7 +43,7 @@ namespace
}
-void StreamMessageProducer::listen(MessageConsumer callBack)
+void LSPStreamMessageProducer::listen(MessageConsumer callBack)
{
if(!input)
return;
@@ -94,51 +95,51 @@ void StreamMessageProducer::listen(MessageConsumer callBack)
else
{
- debugBuilder.push_back((char)c);
- if (c == '\n')
- {
- if (newLine) {
- // Two consecutive newlines have been read, which signals the start of the message content
- if (headers.contentLength <= 0)
- {
- string info = "Unexpected token:" + debugBuilder;
- info = +" (expected Content-Length: sequence);";
- MessageIssue issue(info, lsp::Log::Level::WARNING);
- issueHandler.handle(std::move(issue));
- }
- else {
- bool result = handleMessage(headers,callBack);
- if (!result)
- keepRunning = false;
- newLine = false;
- }
- headers.clear();
- debugBuilder.clear();
- }
- else if (!headerBuilder.empty()) {
- // A single newline ends a header line
- parseHeader(headerBuilder, headers);
- headerBuilder.clear();
- }
- newLine = true;
+ debugBuilder.push_back((char)c);
+ if (c == '\n')
+ {
+ if (newLine) {
+ // Two consecutive newlines have been read, which signals the start of the message content
+ if (headers.contentLength <= 0)
+ {
+ string info = "Unexpected token:" + debugBuilder;
+ info = +" (expected Content-Length: sequence);";
+ MessageIssue issue(info, lsp::Log::Level::WARNING);
+ issueHandler.handle(std::move(issue));
+ }
+ else {
+ bool result = handleMessage(headers,callBack);
+ if (!result)
+ keepRunning = false;
+ newLine = false;
+ }
+ headers.clear();
+ debugBuilder.clear();
}
- else if (c != '\r') {
- // Add the input to the current header line
-
- headerBuilder.push_back((char)c);
- newLine = false;
+ else if (!headerBuilder.empty()) {
+ // A single newline ends a header line
+ parseHeader(headerBuilder, headers);
+ headerBuilder.clear();
}
+ newLine = true;
+ }
+ else if (c != '\r') {
+ // Add the input to the current header line
+
+ headerBuilder.push_back((char)c);
+ newLine = false;
+ }
}
}
}
-void StreamMessageProducer::bind(std::shared_ptr<lsp::istream>_in)
+void LSPStreamMessageProducer::bind(std::shared_ptr<lsp::istream>_in)
{
input = _in;
}
-bool StreamMessageProducer::handleMessage(Headers& headers ,MessageConsumer callBack)
+bool LSPStreamMessageProducer::handleMessage(Headers& headers ,MessageConsumer callBack)
{
// Read content.
auto content_length = headers.contentLength;
@@ -189,3 +190,108 @@ bool StreamMessageProducer::handleMessage(Headers& headers ,MessageConsumer call
return true;
}
+
+
+/// For lit tests we support a simplified syntax:
+/// - messages are delimited by '// -----' on a line by itself
+/// - lines starting with // are ignored.
+/// This is a testing path, so favor simplicity over performance here.
+
+void DelimitedStreamMessageProducer::listen(MessageConsumer callBack)
+{
+ if(!input)
+ return;
+
+ keepRunning = true;
+
+ auto readLine = [&]( std::string_ref& lineBuilder) -> bool {
+ while (keepRunning)
+ {
+ if(input->bad())
+ {
+ std::string info = "Input stream is bad.";
+ auto what = input->what();
+ if (what.size())
+ {
+ info += "Reason:";
+ info += input->what();
+ }
+ MessageIssue issue(info, lsp::Log::Level::SEVERE);
+ issueHandler.handle(std::move(issue));
+ return false;
+ }
+ if(input->fail())
+ {
+ std::string info = "Input fail.";
+ auto what = input->what();
+ if(what.size())
+ {
+ info += "Reason:";
+ info += input->what();
+ }
+ MessageIssue issue(info, lsp::Log::Level::WARNING);
+ issueHandler.handle(std::move(issue));
+ if(input->need_to_clear_the_state())
+ input->clear();
+ else
+ {
+ return false;
+ }
+ }
+ int c = input->get();
+ if (c == EOF) {
+ // End of input stream has been reached
+ keepRunning = false;
+ }
+ else
+ {
+ if (c == '\n')
+ {
+ if(!lineBuilder.empty()){
+ lineBuilder.push_back(c);
+ return true;
+ }
+ }
+ else if (c != '\r') {
+ // Add the input to the current header line
+
+ lineBuilder.push_back((char)c);
+ }
+ }
+ }
+ return false;
+ };
+
+ auto getMessage = [&](std::string& json) -> bool {
+ std::string_ref lineBuilder ;
+ while (readLine(lineBuilder)){
+ lineBuilder.trim();
+ if(lineBuilder.start_with("//")){
+ // Found a delimiter for the message.
+ if (lineBuilder == "// -----")
+ {
+ return true;
+ }
+ }
+ json += lineBuilder;
+ }
+ return false;
+ };
+
+
+ while (true) {
+ std::string json;
+ if (getMessage(json)) {
+ callBack(std::move(json));
+ }else{
+ return ;
+ }
+ }
+}
+
+void DelimitedStreamMessageProducer::bind(std::shared_ptr<lsp::istream>_in)
+{
+ input = _in;
+}
+
+
diff --git a/Build/source/utils/asymptote/LspCpp/src/jsonrpc/TcpServer.cpp b/Build/source/utils/asymptote/LspCpp/src/jsonrpc/TcpServer.cpp
index 799d0aec9ad..4b3a9aea35f 100755
--- a/Build/source/utils/asymptote/LspCpp/src/jsonrpc/TcpServer.cpp
+++ b/Build/source/utils/asymptote/LspCpp/src/jsonrpc/TcpServer.cpp
@@ -97,18 +97,18 @@ namespace lsp {
{
do_read();
}
- void do_write(const std::string& data)
+ void do_write(const char* data, size_t size)
{
- socket_.async_write_some(boost::asio::buffer(data.data(), data.size()),
- boost::asio::bind_executor(strand_,[this](boost::system::error_code ec, std::size_t n)
- {
- if (!ec)
- {
- return;
- }
- proxy_->error_message = ec.message();
-
- }));
+ socket_.async_write_some(boost::asio::buffer(data, size),
+ boost::asio::bind_executor(strand_,[this](boost::system::error_code ec, std::size_t n)
+ {
+ if (!ec)
+ {
+ return;
+ }
+ proxy_->error_message = ec.message();
+
+ }));
}
void do_read()
{
@@ -140,13 +140,23 @@ namespace lsp {
tcp_stream_wrapper& tcp_stream_wrapper::write(const std::string& c)
{
- session.do_write(c);
- return *this;
+ size_t off = 0;
+ for(;off < c.size();){
+ if(off + 1024 < c.size()){
+ session.do_write(c.data()+off,1024);
+ off += 1024;
+ }else{
+ session.do_write(c.data()+off,c.size() - off);
+ break;
+ }
+ }
+ return *this;
}
tcp_stream_wrapper& tcp_stream_wrapper::write(std::streamsize _s)
{
- session.do_write(std::to_string(_s));
+ auto s = std::to_string(_s);
+ session.do_write(s.data(),s.size());
return *this;
}
@@ -195,7 +205,7 @@ namespace lsp {
TcpServer::TcpServer(const std::string& address, const std::string& port,
std::shared_ptr < MessageJsonHandler> json_handler,
std::shared_ptr < Endpoint> localEndPoint, lsp::Log& log, uint32_t _max_workers)
- : point(json_handler, localEndPoint, log, _max_workers),d_ptr(new Data( log, _max_workers))
+ : point(json_handler, localEndPoint, log,lsp::JSONStreamStyle::Standard, _max_workers),d_ptr(new Data( log, _max_workers))
{
diff --git a/Build/source/utils/asymptote/LspCpp/src/jsonrpc/WebSocketServer.cpp b/Build/source/utils/asymptote/LspCpp/src/jsonrpc/WebSocketServer.cpp
index 80806e848be..92a25e88dbb 100755
--- a/Build/source/utils/asymptote/LspCpp/src/jsonrpc/WebSocketServer.cpp
+++ b/Build/source/utils/asymptote/LspCpp/src/jsonrpc/WebSocketServer.cpp
@@ -239,7 +239,7 @@ namespace lsp {
WebSocketServer::WebSocketServer(const std::string& user_agent, const std::string& address, const std::string& port,
std::shared_ptr < MessageJsonHandler> json_handler,
std::shared_ptr < Endpoint> localEndPoint, lsp::Log& log, uint32_t _max_workers)
- : point(json_handler,localEndPoint,log, _max_workers),d_ptr(new Data(user_agent,log))
+ : point(json_handler,localEndPoint,log,lsp::JSONStreamStyle::Standard, _max_workers),d_ptr(new Data(user_agent,log))
{
diff --git a/Build/source/utils/asymptote/LspCpp/src/lsp/ParentProcessWatcher.cpp b/Build/source/utils/asymptote/LspCpp/src/lsp/ParentProcessWatcher.cpp
index 02c61e67a59..c698a3157e6 100755
--- a/Build/source/utils/asymptote/LspCpp/src/lsp/ParentProcessWatcher.cpp
+++ b/Build/source/utils/asymptote/LspCpp/src/lsp/ParentProcessWatcher.cpp
@@ -1,4 +1,5 @@
#include "LibLsp/lsp/ParentProcessWatcher.h"
+#include <algorithm>
#include <boost/process.hpp>
#ifdef _WIN32
diff --git a/Build/source/utils/asymptote/LspCpp/src/lsp/initialize.cpp b/Build/source/utils/asymptote/LspCpp/src/lsp/initialize.cpp
index 7348cbd0df3..504caa3e656 100755
--- a/Build/source/utils/asymptote/LspCpp/src/lsp/initialize.cpp
+++ b/Build/source/utils/asymptote/LspCpp/src/lsp/initialize.cpp
@@ -32,7 +32,7 @@ void Reflect(Writer& writer, lsInitializeParams::lsTrace& value)
break;
}
}
- void Reflect(Reader& visitor, std::pair<boost::optional<lsTextDocumentSyncKind>, boost::optional<lsTextDocumentSyncOptions> >& value)
+ void Reflect(Reader& visitor, std::pair<optional<lsTextDocumentSyncKind>, optional<lsTextDocumentSyncOptions> >& value)
{
if(((JsonReader&)visitor).m_->IsObject())
{
diff --git a/Build/source/utils/asymptote/LspCpp/src/lsp/lsp.cpp b/Build/source/utils/asymptote/LspCpp/src/lsp/lsp.cpp
index 792995c8fb0..d070f22be13 100755
--- a/Build/source/utils/asymptote/LspCpp/src/lsp/lsp.cpp
+++ b/Build/source/utils/asymptote/LspCpp/src/lsp/lsp.cpp
@@ -397,7 +397,7 @@ bool lsp::Any::GetForMapHelper(std::string& value)
return Get(value);
}
-bool lsp::Any::GetForMapHelper(boost::optional<std::string>& value)
+bool lsp::Any::GetForMapHelper(optional<std::string>& value)
{
return Get(value);
}
@@ -558,7 +558,7 @@ lsRenameFile::lsRenameFile()
}
-void Reflect(Reader& visitor, boost::optional< SelectionRange* >& value)
+void Reflect(Reader& visitor, optional< SelectionRange* >& value)
{
if (visitor.IsNull()) {
visitor.GetNull();
diff --git a/Build/source/utils/asymptote/LspCpp/src/lsp/textDocument.cpp b/Build/source/utils/asymptote/LspCpp/src/lsp/textDocument.cpp
index a95c2b1ea86..c87a047d3f2 100755
--- a/Build/source/utils/asymptote/LspCpp/src/lsp/textDocument.cpp
+++ b/Build/source/utils/asymptote/LspCpp/src/lsp/textDocument.cpp
@@ -231,7 +231,7 @@ void Reflect(Reader& visitor, TextDocumentDocumentSymbol::Either& value)
}
}
-void Reflect(Reader& visitor, std::pair<boost::optional<std::string>, boost::optional<lsMarkedString>>& value)
+void Reflect(Reader& visitor, std::pair<optional<std::string>, optional<lsMarkedString>>& value)
{
if (!visitor.IsString())
@@ -244,7 +244,7 @@ void Reflect(Reader& visitor, std::pair<boost::optional<std::string>, boost::opt
}
}
-void Reflect(Reader& visitor, std::pair<boost::optional<std::string>, boost::optional<MarkupContent>>& value)
+void Reflect(Reader& visitor, std::pair<optional<std::string>, optional<MarkupContent>>& value)
{
if (!visitor.IsString())
{
diff --git a/Build/source/utils/asymptote/LspCpp/src/lsp/utils.cpp b/Build/source/utils/asymptote/LspCpp/src/lsp/utils.cpp
index 445f4a72cff..f950b9ee791 100755
--- a/Build/source/utils/asymptote/LspCpp/src/lsp/utils.cpp
+++ b/Build/source/utils/asymptote/LspCpp/src/lsp/utils.cpp
@@ -191,7 +191,7 @@ bool FileExists(const std::string& filename) {
return cache.is_open();
}
-boost::optional<std::string> ReadContent(const AbsolutePath& filename) {
+optional<std::string> ReadContent(const AbsolutePath& filename) {
std::ifstream cache;
cache.open(filename.path);
diff --git a/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/CMakeLists.txt b/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/CMakeLists.txt
index bdfdd6779e6..dd1f173d1c0 100644
--- a/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/CMakeLists.txt
+++ b/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12)
if(POLICY CMP0025)
# detect Apple's Clang
cmake_policy(SET CMP0025 NEW)
@@ -68,7 +68,7 @@ endif(CCACHE_FOUND)
if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
if(RAPIDJSON_ENABLE_INSTRUMENTATION_OPT AND NOT CMAKE_CROSSCOMPILING)
- if(CMAKE_SYSTEM_PROCESSOR STREQUAL "powerpc" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64le")
+ if(CMAKE_SYSTEM_PROCESSOR STREQUAL "powerpc" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64le")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mcpu=native")
else()
#FIXME: x86 is -march=native, but doesn't mean every arch is this option. To keep original project's compatibility, I leave this except POWER.
@@ -102,7 +102,7 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
endif()
elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
if(NOT CMAKE_CROSSCOMPILING)
- if(CMAKE_SYSTEM_PROCESSOR STREQUAL "powerpc" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64le")
+ if(CMAKE_SYSTEM_PROCESSOR STREQUAL "powerpc" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64" OR CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64le")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mcpu=native")
else()
#FIXME: x86 is -march=native, but doesn't mean every arch is this option. To keep original project's compatibility, I leave this except POWER.
@@ -128,6 +128,7 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
endif()
elseif (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
add_definitions(-D_CRT_SECURE_NO_WARNINGS=1)
+ add_definitions(-DNOMINMAX)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc")
# CMake >= 3.10 should handle the above CMAKE_CXX_STANDARD fine, otherwise use /std:c++XX with MSVC >= 19.10
if (RAPIDJSON_BUILD_CXX11 AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "19.10")
diff --git a/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/bin/unittestschema/address.json b/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/bin/unittestschema/address.json
index c3cf6426131..abec3ec5777 100644
--- a/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/bin/unittestschema/address.json
+++ b/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/bin/unittestschema/address.json
@@ -97,11 +97,11 @@
},
"county_type": {
"type": "string",
- "enum": ["Sussex", "Surrey", "Kent"]
+ "enum": ["Sussex", "Surrey", "Kent", "Narnia"]
},
"province_type": {
"type": "string",
- "enum": ["Quebec", "BC", "Alberta"]
+ "enum": ["Quebec", "Narnia", "BC", "Alberta"]
},
"date_type": {
"pattern": "^([0-9]([0-9]([0-9][1-9]|[1-9]0)|[1-9]00)|[1-9]000)(-(0[1-9]|1[0-2])(-(0[1-9]|[1-2][0-9]|3[0-1]))?)?$",
@@ -132,7 +132,6 @@
"type": "string"
},
"url_type": {
- "pattern": "^\\S*$",
"type": "string"
}
}
diff --git a/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/contrib/natvis/rapidjson.natvis b/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/contrib/natvis/rapidjson.natvis
index e7bd44b6ed7..2a4316ee98c 100644
--- a/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/contrib/natvis/rapidjson.natvis
+++ b/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/contrib/natvis/rapidjson.natvis
@@ -2,30 +2,30 @@
<AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">
<!-- rapidjson::GenericValue - basic support -->
<Type Name="rapidjson::GenericValue&lt;*,*&gt;">
- <DisplayString Condition="(data_.f.flags &amp; kTypeMask) == kNullType">null</DisplayString>
+ <DisplayString Condition="(data_.f.flags &amp; kTypeMask) == rapidjson::kNullType">null</DisplayString>
<DisplayString Condition="data_.f.flags == kTrueFlag">true</DisplayString>
<DisplayString Condition="data_.f.flags == kFalseFlag">false</DisplayString>
<DisplayString Condition="data_.f.flags == kShortStringFlag">{(const Ch*)data_.ss.str,na}</DisplayString>
- <DisplayString Condition="(data_.f.flags &amp; kTypeMask) == kStringType">{(const Ch*)((size_t)data_.s.str &amp; 0x0000FFFFFFFFFFFF),na}</DisplayString>
+ <DisplayString Condition="(data_.f.flags &amp; kTypeMask) == rapidjson::kStringType">{(const Ch*)((size_t)data_.s.str &amp; 0x0000FFFFFFFFFFFF),[data_.s.length]na}</DisplayString>
<DisplayString Condition="(data_.f.flags &amp; kNumberIntFlag) == kNumberIntFlag">{data_.n.i.i}</DisplayString>
<DisplayString Condition="(data_.f.flags &amp; kNumberUintFlag) == kNumberUintFlag">{data_.n.u.u}</DisplayString>
<DisplayString Condition="(data_.f.flags &amp; kNumberInt64Flag) == kNumberInt64Flag">{data_.n.i64}</DisplayString>
<DisplayString Condition="(data_.f.flags &amp; kNumberUint64Flag) == kNumberUint64Flag">{data_.n.u64}</DisplayString>
<DisplayString Condition="(data_.f.flags &amp; kNumberDoubleFlag) == kNumberDoubleFlag">{data_.n.d}</DisplayString>
- <DisplayString Condition="data_.f.flags == kObjectType">Object members={data_.o.size}</DisplayString>
- <DisplayString Condition="data_.f.flags == kArrayType">Array members={data_.a.size}</DisplayString>
+ <DisplayString Condition="data_.f.flags == rapidjson::kObjectType">Object members={data_.o.size}</DisplayString>
+ <DisplayString Condition="data_.f.flags == rapidjson::kArrayType">Array members={data_.a.size}</DisplayString>
<Expand>
- <Item Condition="data_.f.flags == kObjectType" Name="[size]">data_.o.size</Item>
- <Item Condition="data_.f.flags == kObjectType" Name="[capacity]">data_.o.capacity</Item>
- <ArrayItems Condition="data_.f.flags == kObjectType">
+ <Item Condition="data_.f.flags == rapidjson::kObjectType" Name="[size]">data_.o.size</Item>
+ <Item Condition="data_.f.flags == rapidjson::kObjectType" Name="[capacity]">data_.o.capacity</Item>
+ <ArrayItems Condition="data_.f.flags == rapidjson::kObjectType">
<Size>data_.o.size</Size>
<!-- NOTE: Rapidjson stores some extra data in the high bits of pointers, which is why the mask -->
<ValuePointer>(rapidjson::GenericMember&lt;$T1,$T2&gt;*)(((size_t)data_.o.members) &amp; 0x0000FFFFFFFFFFFF)</ValuePointer>
</ArrayItems>
- <Item Condition="data_.f.flags == kArrayType" Name="[size]">data_.a.size</Item>
- <Item Condition="data_.f.flags == kArrayType" Name="[capacity]">data_.a.capacity</Item>
- <ArrayItems Condition="data_.f.flags == kArrayType">
+ <Item Condition="data_.f.flags == rapidjson::kArrayType" Name="[size]">data_.a.size</Item>
+ <Item Condition="data_.f.flags == rapidjson::kArrayType" Name="[capacity]">data_.a.capacity</Item>
+ <ArrayItems Condition="data_.f.flags == rapidjson::kArrayType">
<Size>data_.a.size</Size>
<!-- NOTE: Rapidjson stores some extra data in the high bits of pointers, which is why the mask -->
<ValuePointer>(rapidjson::GenericValue&lt;$T1,$T2&gt;*)(((size_t)data_.a.elements) &amp; 0x0000FFFFFFFFFFFF)</ValuePointer>
diff --git a/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/doc/features.md b/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/doc/features.md
index 0d79e7f8925..4d159370ac1 100644
--- a/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/doc/features.md
+++ b/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/doc/features.md
@@ -22,13 +22,15 @@
* RapidJSON should be fully RFC4627/ECMA-404 compliance.
* Support JSON Pointer (RFC6901).
* Support JSON Schema Draft v4.
+* Support Swagger v2 schema.
+* Support OpenAPI v3.0.x schema.
* Support Unicode surrogate.
* Support null character (`"\u0000"`)
- * For example, `["Hello\u0000World"]` can be parsed and handled gracefully. There is API for getting/setting lengths of string.
+* For example, `["Hello\u0000World"]` can be parsed and handled gracefully. There is API for getting/setting lengths of string.
* Support optional relaxed syntax.
- * Single line (`// ...`) and multiple line (`/* ... */`) comments (`kParseCommentsFlag`).
- * Trailing commas at the end of objects and arrays (`kParseTrailingCommasFlag`).
- * `NaN`, `Inf`, `Infinity`, `-Inf` and `-Infinity` as `double` values (`kParseNanAndInfFlag`)
+* Single line (`// ...`) and multiple line (`/* ... */`) comments (`kParseCommentsFlag`).
+* Trailing commas at the end of objects and arrays (`kParseTrailingCommasFlag`).
+* `NaN`, `Inf`, `Infinity`, `-Inf` and `-Infinity` as `double` values (`kParseNanAndInfFlag`)
* [NPM compliant](http://github.com/Tencent/rapidjson/blob/master/doc/npm.md).
## Unicode
diff --git a/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/doc/schema.md b/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/doc/schema.md
index 238d7a56aed..4da4474b2e0 100644
--- a/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/doc/schema.md
+++ b/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/doc/schema.md
@@ -24,7 +24,15 @@ if (sd.Parse(schemaJson).HasParseError()) {
// the schema is not a valid JSON.
// ...
}
+
SchemaDocument schema(sd); // Compile a Document to SchemaDocument
+if (!schema.GetError().ObjectEmpty()) {
+ // there was a problem compiling the schema
+ StringBuffer sb;
+ Writer<StringBuffer> w(sb);
+ schema.GetError().Accept(w);
+ printf("Invalid schema: %s\n", sb.GetString());
+}
// sd is no longer needed here.
Document d;
diff --git a/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/example/schemavalidator/schemavalidator.cpp b/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/example/schemavalidator/schemavalidator.cpp
index 9fa1bb10a11..0d3d0632f28 100644
--- a/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/example/schemavalidator/schemavalidator.cpp
+++ b/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/example/schemavalidator/schemavalidator.cpp
@@ -41,7 +41,8 @@ static std::string GetString(const ValueType& val) {
s << "false";
else if (val.IsFloat())
s << val.GetFloat();
- return s.str();}
+ return s.str();
+}
// Create the error message for a named error
// The error object can either be empty or contain at least member properties:
diff --git a/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/allocators.h b/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/allocators.h
index 8918cf76fe3..a943cf19934 100644
--- a/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/allocators.h
+++ b/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/allocators.h
@@ -19,6 +19,7 @@
#include "internal/meta.h"
#include <memory>
+#include <limits>
#if RAPIDJSON_HAS_CXX11
#include <type_traits>
@@ -433,7 +434,7 @@ namespace internal {
template<typename T, typename A>
inline T* Realloc(A& a, T* old_p, size_t old_n, size_t new_n)
{
- RAPIDJSON_NOEXCEPT_ASSERT(old_n <= SIZE_MAX / sizeof(T) && new_n <= SIZE_MAX / sizeof(T));
+ RAPIDJSON_NOEXCEPT_ASSERT(old_n <= (std::numeric_limits<size_t>::max)() / sizeof(T) && new_n <= (std::numeric_limits<size_t>::max)() / sizeof(T));
return static_cast<T*>(a.Realloc(old_p, old_n * sizeof(T), new_n * sizeof(T)));
}
diff --git a/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/document.h b/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/document.h
index 660e14eb531..d1420719bb0 100644
--- a/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/document.h
+++ b/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/document.h
@@ -75,7 +75,7 @@ class GenericDocument;
User can define this to use CrtAllocator or MemoryPoolAllocator.
*/
#ifndef RAPIDJSON_DEFAULT_ALLOCATOR
-#define RAPIDJSON_DEFAULT_ALLOCATOR MemoryPoolAllocator<CrtAllocator>
+#define RAPIDJSON_DEFAULT_ALLOCATOR ::RAPIDJSON_NAMESPACE::MemoryPoolAllocator<::RAPIDJSON_NAMESPACE::CrtAllocator>
#endif
/*! \def RAPIDJSON_DEFAULT_STACK_ALLOCATOR
@@ -85,7 +85,7 @@ class GenericDocument;
User can define this to use CrtAllocator or MemoryPoolAllocator.
*/
#ifndef RAPIDJSON_DEFAULT_STACK_ALLOCATOR
-#define RAPIDJSON_DEFAULT_STACK_ALLOCATOR CrtAllocator
+#define RAPIDJSON_DEFAULT_STACK_ALLOCATOR ::RAPIDJSON_NAMESPACE::CrtAllocator
#endif
/*! \def RAPIDJSON_VALUE_DEFAULT_OBJECT_CAPACITY
@@ -1078,6 +1078,7 @@ public:
*/
template <typename T> RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T>,internal::IsGenericValue<T> >), (bool)) operator==(const T& rhs) const { return *this == GenericValue(rhs); }
+#ifndef __cpp_impl_three_way_comparison
//! Not-equal-to operator
/*! \return !(*this == rhs)
*/
@@ -1092,7 +1093,6 @@ public:
*/
template <typename T> RAPIDJSON_DISABLEIF_RETURN((internal::IsGenericValue<T>), (bool)) operator!=(const T& rhs) const { return !(*this == rhs); }
-#ifndef __cpp_lib_three_way_comparison
//! Equal-to operator with arbitrary types (symmetric version)
/*! \return (rhs == lhs)
*/
@@ -1230,13 +1230,28 @@ public:
else {
RAPIDJSON_ASSERT(false); // see above note
- // This will generate -Wexit-time-destructors in clang
- // static GenericValue NullValue;
- // return NullValue;
-
- // Use static buffer and placement-new to prevent destruction
- static char buffer[sizeof(GenericValue)];
+#if RAPIDJSON_HAS_CXX11
+ // Use thread-local storage to prevent races between threads.
+ // Use static buffer and placement-new to prevent destruction, with
+ // alignas() to ensure proper alignment.
+ alignas(GenericValue) thread_local static char buffer[sizeof(GenericValue)];
+ return *new (buffer) GenericValue();
+#elif defined(_MSC_VER) && _MSC_VER < 1900
+ // There's no way to solve both thread locality and proper alignment
+ // simultaneously.
+ __declspec(thread) static char buffer[sizeof(GenericValue)];
return *new (buffer) GenericValue();
+#elif defined(__GNUC__) || defined(__clang__)
+ // This will generate -Wexit-time-destructors in clang, but that's
+ // better than having under-alignment.
+ __thread static GenericValue buffer;
+ return buffer;
+#else
+ // Don't know what compiler this is, so don't know how to ensure
+ // thread-locality.
+ static GenericValue buffer;
+ return buffer;
+#endif
}
}
template <typename SourceAllocator>
@@ -2486,6 +2501,7 @@ public:
typedef typename Encoding::Ch Ch; //!< Character type derived from Encoding.
typedef GenericValue<Encoding, Allocator> ValueType; //!< Value type of the document.
typedef Allocator AllocatorType; //!< Allocator type from template parameter.
+ typedef StackAllocator StackAllocatorType; //!< StackAllocator type from template parameter.
//! Constructor
/*! Creates an empty document of specified type.
diff --git a/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/error/en.h b/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/error/en.h
index 7c620a2e6b8..c87b04eb133 100644
--- a/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/error/en.h
+++ b/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/error/en.h
@@ -104,15 +104,69 @@ inline const RAPIDJSON_ERROR_CHARTYPE* GetValidateError_En(ValidateErrorCode val
case kValidateErrorType: return RAPIDJSON_ERROR_STRING("Property has a type '%actual' that is not in the following list: '%expected'.");
case kValidateErrorOneOf: return RAPIDJSON_ERROR_STRING("Property did not match any of the sub-schemas specified by 'oneOf', refer to following errors.");
- case kValidateErrorOneOfMatch: return RAPIDJSON_ERROR_STRING("Property matched more than one of the sub-schemas specified by 'oneOf'.");
+ case kValidateErrorOneOfMatch: return RAPIDJSON_ERROR_STRING("Property matched more than one of the sub-schemas specified by 'oneOf', indices '%matches'.");
case kValidateErrorAllOf: return RAPIDJSON_ERROR_STRING("Property did not match all of the sub-schemas specified by 'allOf', refer to following errors.");
case kValidateErrorAnyOf: return RAPIDJSON_ERROR_STRING("Property did not match any of the sub-schemas specified by 'anyOf', refer to following errors.");
case kValidateErrorNot: return RAPIDJSON_ERROR_STRING("Property matched the sub-schema specified by 'not'.");
+ case kValidateErrorReadOnly: return RAPIDJSON_ERROR_STRING("Property is read-only but has been provided when validation is for writing.");
+ case kValidateErrorWriteOnly: return RAPIDJSON_ERROR_STRING("Property is write-only but has been provided when validation is for reading.");
+
default: return RAPIDJSON_ERROR_STRING("Unknown error.");
}
}
+//! Maps error code of schema document compilation into error message.
+/*!
+ \ingroup RAPIDJSON_ERRORS
+ \param schemaErrorCode Error code obtained from compiling the schema document.
+ \return the error message.
+ \note User can make a copy of this function for localization.
+ Using switch-case is safer for future modification of error codes.
+*/
+ inline const RAPIDJSON_ERROR_CHARTYPE* GetSchemaError_En(SchemaErrorCode schemaErrorCode) {
+ switch (schemaErrorCode) {
+ case kSchemaErrorNone: return RAPIDJSON_ERROR_STRING("No error.");
+
+ case kSchemaErrorStartUnknown: return RAPIDJSON_ERROR_STRING("Pointer '%value' to start of schema does not resolve to a location in the document.");
+ case kSchemaErrorRefPlainName: return RAPIDJSON_ERROR_STRING("$ref fragment '%value' must be a JSON pointer.");
+ case kSchemaErrorRefInvalid: return RAPIDJSON_ERROR_STRING("$ref must not be an empty string.");
+ case kSchemaErrorRefPointerInvalid: return RAPIDJSON_ERROR_STRING("$ref fragment '%value' is not a valid JSON pointer at offset '%offset'.");
+ case kSchemaErrorRefUnknown: return RAPIDJSON_ERROR_STRING("$ref '%value' does not resolve to a location in the target document.");
+ case kSchemaErrorRefCyclical: return RAPIDJSON_ERROR_STRING("$ref '%value' is cyclical.");
+ case kSchemaErrorRefNoRemoteProvider: return RAPIDJSON_ERROR_STRING("$ref is remote but there is no remote provider.");
+ case kSchemaErrorRefNoRemoteSchema: return RAPIDJSON_ERROR_STRING("$ref '%value' is remote but the remote provider did not return a schema.");
+ case kSchemaErrorRegexInvalid: return RAPIDJSON_ERROR_STRING("Invalid regular expression '%value' in 'pattern' or 'patternProperties'.");
+ case kSchemaErrorSpecUnknown: return RAPIDJSON_ERROR_STRING("JSON schema draft or OpenAPI version is not recognized.");
+ case kSchemaErrorSpecUnsupported: return RAPIDJSON_ERROR_STRING("JSON schema draft or OpenAPI version is not supported.");
+ case kSchemaErrorSpecIllegal: return RAPIDJSON_ERROR_STRING("Both JSON schema draft and OpenAPI version found in document.");
+ case kSchemaErrorReadOnlyAndWriteOnly: return RAPIDJSON_ERROR_STRING("Property must not be both 'readOnly' and 'writeOnly'.");
+
+ default: return RAPIDJSON_ERROR_STRING("Unknown error.");
+ }
+ }
+
+//! Maps error code of pointer parse into error message.
+/*!
+ \ingroup RAPIDJSON_ERRORS
+ \param pointerParseErrorCode Error code obtained from pointer parse.
+ \return the error message.
+ \note User can make a copy of this function for localization.
+ Using switch-case is safer for future modification of error codes.
+*/
+inline const RAPIDJSON_ERROR_CHARTYPE* GetPointerParseError_En(PointerParseErrorCode pointerParseErrorCode) {
+ switch (pointerParseErrorCode) {
+ case kPointerParseErrorNone: return RAPIDJSON_ERROR_STRING("No error.");
+
+ case kPointerParseErrorTokenMustBeginWithSolidus: return RAPIDJSON_ERROR_STRING("A token must begin with a '/'.");
+ case kPointerParseErrorInvalidEscape: return RAPIDJSON_ERROR_STRING("Invalid escape.");
+ case kPointerParseErrorInvalidPercentEncoding: return RAPIDJSON_ERROR_STRING("Invalid percent encoding in URI fragment.");
+ case kPointerParseErrorCharacterMustPercentEncode: return RAPIDJSON_ERROR_STRING("A character must be percent encoded in a URI fragment.");
+
+ default: return RAPIDJSON_ERROR_STRING("Unknown error.");
+ }
+}
+
RAPIDJSON_NAMESPACE_END
#ifdef __clang__
diff --git a/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/error/error.h b/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/error/error.h
index 5c890ba0ead..cae345db36d 100644
--- a/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/error/error.h
+++ b/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/error/error.h
@@ -42,7 +42,7 @@ RAPIDJSON_DIAG_OFF(padded)
///////////////////////////////////////////////////////////////////////////////
// RAPIDJSON_ERROR_STRING
-//! Macro for converting string literial to \ref RAPIDJSON_ERROR_CHARTYPE[].
+//! Macro for converting string literal to \ref RAPIDJSON_ERROR_CHARTYPE[].
/*! \ingroup RAPIDJSON_ERRORS
By default this conversion macro does nothing.
On Windows, user can define this macro as \c _T(x) for supporting both
@@ -185,14 +185,17 @@ enum ValidateErrorCode {
kValidateErrorPatternProperties, //!< See other errors.
kValidateErrorDependencies, //!< Object has missing property or schema dependencies.
- kValidateErrorEnum, //!< Property has a value that is not one of its allowed enumerated values
- kValidateErrorType, //!< Property has a type that is not allowed by the schema..
+ kValidateErrorEnum, //!< Property has a value that is not one of its allowed enumerated values.
+ kValidateErrorType, //!< Property has a type that is not allowed by the schema.
kValidateErrorOneOf, //!< Property did not match any of the sub-schemas specified by 'oneOf'.
kValidateErrorOneOfMatch, //!< Property matched more than one of the sub-schemas specified by 'oneOf'.
kValidateErrorAllOf, //!< Property did not match all of the sub-schemas specified by 'allOf'.
kValidateErrorAnyOf, //!< Property did not match any of the sub-schemas specified by 'anyOf'.
- kValidateErrorNot //!< Property matched the sub-schema specified by 'not'.
+ kValidateErrorNot, //!< Property matched the sub-schema specified by 'not'.
+
+ kValidateErrorReadOnly, //!< Property is read-only but has been provided when validation is for writing
+ kValidateErrorWriteOnly //!< Property is write-only but has been provided when validation is for reading
};
//! Function pointer type of GetValidateError().
@@ -207,6 +210,72 @@ enum ValidateErrorCode {
*/
typedef const RAPIDJSON_ERROR_CHARTYPE* (*GetValidateErrorFunc)(ValidateErrorCode);
+///////////////////////////////////////////////////////////////////////////////
+// SchemaErrorCode
+
+//! Error codes when validating.
+/*! \ingroup RAPIDJSON_ERRORS
+ \see GenericSchemaValidator
+*/
+enum SchemaErrorCode {
+ kSchemaErrorNone = 0, //!< No error.
+
+ kSchemaErrorStartUnknown, //!< Pointer to start of schema does not resolve to a location in the document
+ kSchemaErrorRefPlainName, //!< $ref fragment must be a JSON pointer
+ kSchemaErrorRefInvalid, //!< $ref must not be an empty string
+ kSchemaErrorRefPointerInvalid, //!< $ref fragment is not a valid JSON pointer at offset
+ kSchemaErrorRefUnknown, //!< $ref does not resolve to a location in the target document
+ kSchemaErrorRefCyclical, //!< $ref is cyclical
+ kSchemaErrorRefNoRemoteProvider, //!< $ref is remote but there is no remote provider
+ kSchemaErrorRefNoRemoteSchema, //!< $ref is remote but the remote provider did not return a schema
+ kSchemaErrorRegexInvalid, //!< Invalid regular expression in 'pattern' or 'patternProperties'
+ kSchemaErrorSpecUnknown, //!< JSON schema draft or OpenAPI version is not recognized
+ kSchemaErrorSpecUnsupported, //!< JSON schema draft or OpenAPI version is not supported
+ kSchemaErrorSpecIllegal, //!< Both JSON schema draft and OpenAPI version found in document
+ kSchemaErrorReadOnlyAndWriteOnly //!< Property must not be both 'readOnly' and 'writeOnly'
+};
+
+//! Function pointer type of GetSchemaError().
+/*! \ingroup RAPIDJSON_ERRORS
+
+ This is the prototype for \c GetSchemaError_X(), where \c X is a locale.
+ User can dynamically change locale in runtime, e.g.:
+\code
+ GetSchemaErrorFunc GetSchemaError = GetSchemaError_En; // or whatever
+ const RAPIDJSON_ERROR_CHARTYPE* s = GetSchemaError(validator.GetInvalidSchemaCode());
+\endcode
+*/
+typedef const RAPIDJSON_ERROR_CHARTYPE* (*GetSchemaErrorFunc)(SchemaErrorCode);
+
+///////////////////////////////////////////////////////////////////////////////
+// PointerParseErrorCode
+
+//! Error code of JSON pointer parsing.
+/*! \ingroup RAPIDJSON_ERRORS
+ \see GenericPointer::GenericPointer, GenericPointer::GetParseErrorCode
+*/
+enum PointerParseErrorCode {
+ kPointerParseErrorNone = 0, //!< The parse is successful
+
+ kPointerParseErrorTokenMustBeginWithSolidus, //!< A token must begin with a '/'
+ kPointerParseErrorInvalidEscape, //!< Invalid escape
+ kPointerParseErrorInvalidPercentEncoding, //!< Invalid percent encoding in URI fragment
+ kPointerParseErrorCharacterMustPercentEncode //!< A character must percent encoded in URI fragment
+};
+
+//! Function pointer type of GetPointerParseError().
+/*! \ingroup RAPIDJSON_ERRORS
+
+ This is the prototype for \c GetPointerParseError_X(), where \c X is a locale.
+ User can dynamically change locale in runtime, e.g.:
+\code
+ GetPointerParseErrorFunc GetPointerParseError = GetPointerParseError_En; // or whatever
+ const RAPIDJSON_ERROR_CHARTYPE* s = GetPointerParseError(pointer.GetParseErrorCode());
+\endcode
+*/
+typedef const RAPIDJSON_ERROR_CHARTYPE* (*GetPointerParseErrorFunc)(PointerParseErrorCode);
+
+
RAPIDJSON_NAMESPACE_END
#ifdef __clang__
diff --git a/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/internal/biginteger.h b/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/internal/biginteger.h
index 6c58fc87bb2..09d0387fe6e 100644
--- a/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/internal/biginteger.h
+++ b/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/internal/biginteger.h
@@ -259,7 +259,7 @@ private:
if (low < k)
(*outHigh)++;
return low;
-#elif (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && defined(__x86_64__)
+#elif defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && defined(__x86_64__)
__extension__ typedef unsigned __int128 uint128;
uint128 p = static_cast<uint128>(a) * static_cast<uint128>(b);
p += k;
diff --git a/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/internal/diyfp.h b/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/internal/diyfp.h
index f7d46539a90..1f60fb60ca0 100644
--- a/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/internal/diyfp.h
+++ b/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/internal/diyfp.h
@@ -79,7 +79,7 @@ struct DiyFp {
if (l & (uint64_t(1) << 63)) // rounding
h++;
return DiyFp(h, e + rhs.e + 64);
-#elif (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && defined(__x86_64__)
+#elif defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)) && defined(__x86_64__)
__extension__ typedef unsigned __int128 uint128;
uint128 p = static_cast<uint128>(f) * static_cast<uint128>(rhs.f);
uint64_t h = static_cast<uint64_t>(p >> 64);
diff --git a/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/internal/dtoa.h b/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/internal/dtoa.h
index aa27f7b673c..91c5756d922 100644
--- a/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/internal/dtoa.h
+++ b/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/internal/dtoa.h
@@ -58,11 +58,11 @@ inline int CountDecimalDigit32(uint32_t n) {
}
inline void DigitGen(const DiyFp& W, const DiyFp& Mp, uint64_t delta, char* buffer, int* len, int* K) {
- static const uint64_t kPow10[] = { 1U, 10U, 100U, 1000U, 10000U, 100000U, 1000000U, 10000000U, 100000000U,
- 1000000000U, 10000000000U, 100000000000U, 1000000000000U,
- 10000000000000U, 100000000000000U, 1000000000000000U,
- 10000000000000000U, 100000000000000000U, 1000000000000000000U,
- 10000000000000000000U };
+ static const uint64_t kPow10[] = { 1ULL, 10ULL, 100ULL, 1000ULL, 10000ULL, 100000ULL, 1000000ULL, 10000000ULL, 100000000ULL,
+ 1000000000ULL, 10000000000ULL, 100000000000ULL, 1000000000000ULL,
+ 10000000000000ULL, 100000000000000ULL, 1000000000000000ULL,
+ 10000000000000000ULL, 100000000000000000ULL, 1000000000000000000ULL,
+ 10000000000000000000ULL };
const DiyFp one(uint64_t(1) << -Mp.e, Mp.e);
const DiyFp wp_w = Mp - W;
uint32_t p1 = static_cast<uint32_t>(Mp.f >> -one.e);
diff --git a/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/pointer.h b/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/pointer.h
index d89f943c91c..fb1a5ae2672 100644
--- a/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/pointer.h
+++ b/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/pointer.h
@@ -18,6 +18,7 @@
#include "document.h"
#include "uri.h"
#include "internal/itoa.h"
+#include "error/error.h" // PointerParseErrorCode
#ifdef __clang__
RAPIDJSON_DIAG_PUSH
@@ -31,19 +32,6 @@ RAPIDJSON_NAMESPACE_BEGIN
static const SizeType kPointerInvalidIndex = ~SizeType(0); //!< Represents an invalid index in GenericPointer::Token
-//! Error code of parsing.
-/*! \ingroup RAPIDJSON_ERRORS
- \see GenericPointer::GenericPointer, GenericPointer::GetParseErrorCode
-*/
-enum PointerParseErrorCode {
- kPointerParseErrorNone = 0, //!< The parse is successful
-
- kPointerParseErrorTokenMustBeginWithSolidus, //!< A token must begin with a '/'
- kPointerParseErrorInvalidEscape, //!< Invalid escape
- kPointerParseErrorInvalidPercentEncoding, //!< Invalid percent encoding in URI fragment
- kPointerParseErrorCharacterMustPercentEncode //!< A character must percent encoded in URI fragment
-};
-
///////////////////////////////////////////////////////////////////////////////
// GenericPointer
@@ -84,7 +72,7 @@ public:
typedef GenericUri<ValueType, Allocator> UriType;
- //! A token is the basic units of internal representation.
+ //! A token is the basic units of internal representation.
/*!
A JSON pointer string representation "/foo/123" is parsed to two tokens:
"foo" and 123. 123 will be represented in both numeric form and string form.
@@ -902,10 +890,16 @@ private:
std::memcpy(nameBuffer_, rhs.nameBuffer_, nameBufferSize * sizeof(Ch));
}
- // Adjust pointers to name buffer
- std::ptrdiff_t diff = nameBuffer_ - rhs.nameBuffer_;
- for (Token *t = tokens_; t != tokens_ + rhs.tokenCount_; ++t)
- t->name += diff;
+ // The names of each token point to a string in the nameBuffer_. The
+ // previous memcpy copied over string pointers into the rhs.nameBuffer_,
+ // but they should point to the strings in the new nameBuffer_.
+ for (size_t i = 0; i < rhs.tokenCount_; ++i) {
+ // The offset between the string address and the name buffer should
+ // still be constant, so we can just get this offset and set each new
+ // token name according the new buffer start + the known offset.
+ std::ptrdiff_t name_offset = rhs.tokens_[i].name - rhs.nameBuffer_;
+ tokens_[i].name = nameBuffer_ + name_offset;
+ }
return nameBuffer_ + nameBufferSize;
}
diff --git a/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/rapidjson.h b/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/rapidjson.h
index 77cede6067f..89de8386198 100644
--- a/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/rapidjson.h
+++ b/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/rapidjson.h
@@ -195,7 +195,7 @@
*/
#ifndef RAPIDJSON_NO_INT64DEFINE
//!@cond RAPIDJSON_HIDDEN_FROM_DOXYGEN
-#if defined(_MSC_VER) && (_MSC_VER < 1800) // Visual Studio 2013
+#if defined(_MSC_VER) && (_MSC_VER < 1800) // Visual Studio 2013
#include "msinttypes/stdint.h"
#include "msinttypes/inttypes.h"
#else
diff --git a/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/reader.h b/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/reader.h
index b37afffb2e1..55546601e29 100644
--- a/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/reader.h
+++ b/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/reader.h
@@ -1433,7 +1433,7 @@ private:
class NumberStream<InputStream, StackCharacter, true, false> : public NumberStream<InputStream, StackCharacter, false, false> {
typedef NumberStream<InputStream, StackCharacter, false, false> Base;
public:
- NumberStream(GenericReader& reader, InputStream& is) : Base(reader, is), stackStream(reader.stack_) {}
+ NumberStream(GenericReader& reader, InputStream& s) : Base(reader, s), stackStream(reader.stack_) {}
RAPIDJSON_FORCEINLINE Ch TakePush() {
stackStream.Put(static_cast<StackCharacter>(Base::is.Peek()));
@@ -1459,7 +1459,7 @@ private:
class NumberStream<InputStream, StackCharacter, true, true> : public NumberStream<InputStream, StackCharacter, true, false> {
typedef NumberStream<InputStream, StackCharacter, true, false> Base;
public:
- NumberStream(GenericReader& reader, InputStream& is) : Base(reader, is) {}
+ NumberStream(GenericReader& reader, InputStream& s) : Base(reader, s) {}
RAPIDJSON_FORCEINLINE Ch Take() { return Base::TakePush(); }
};
diff --git a/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/schema.h b/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/schema.h
index 1db4b57cbf7..cb799cbacf9 100644
--- a/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/schema.h
+++ b/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/include/rapidjson/schema.h
@@ -50,10 +50,6 @@
#define RAPIDJSON_SCHEMA_VERBOSE 0
#endif
-#if RAPIDJSON_SCHEMA_VERBOSE
-#include "stringbuffer.h"
-#endif
-
RAPIDJSON_DIAG_PUSH
#if defined(__GNUC__)
@@ -78,48 +74,94 @@ RAPIDJSON_NAMESPACE_BEGIN
namespace internal {
-inline void PrintInvalidKeyword(const char* keyword) {
- printf("Fail keyword: %s\n", keyword);
+inline void PrintInvalidKeywordData(const char* keyword) {
+ printf(" Fail keyword: '%s'\n", keyword);
+}
+
+inline void PrintInvalidKeywordData(const wchar_t* keyword) {
+ wprintf(L" Fail keyword: '%ls'\n", keyword);
+}
+
+inline void PrintInvalidDocumentData(const char* document) {
+ printf(" Fail document: '%s'\n", document);
+}
+
+inline void PrintInvalidDocumentData(const wchar_t* document) {
+ wprintf(L" Fail document: '%ls'\n", document);
+}
+
+inline void PrintValidatorPointersData(const char* s, const char* d, unsigned depth) {
+ printf(" Sch: %*s'%s'\n Doc: %*s'%s'\n", depth * 4, " ", s, depth * 4, " ", d);
+}
+
+inline void PrintValidatorPointersData(const wchar_t* s, const wchar_t* d, unsigned depth) {
+ wprintf(L" Sch: %*ls'%ls'\n Doc: %*ls'%ls'\n", depth * 4, L" ", s, depth * 4, L" ", d);
+}
+
+inline void PrintSchemaIdsData(const char* base, const char* local, const char* resolved) {
+ printf(" Resolving id: Base: '%s', Local: '%s', Resolved: '%s'\n", base, local, resolved);
+}
+
+inline void PrintSchemaIdsData(const wchar_t* base, const wchar_t* local, const wchar_t* resolved) {
+ wprintf(L" Resolving id: Base: '%ls', Local: '%ls', Resolved: '%ls'\n", base, local, resolved);
+}
+
+inline void PrintMethodData(const char* method) {
+ printf("%s\n", method);
+}
+
+inline void PrintMethodData(const char* method, bool b) {
+ printf("%s, Data: '%s'\n", method, b ? "true" : "false");
+}
+
+inline void PrintMethodData(const char* method, int64_t i) {
+ printf("%s, Data: '%" PRId64 "'\n", method, i);
}
-inline void PrintInvalidKeyword(const wchar_t* keyword) {
- wprintf(L"Fail keyword: %ls\n", keyword);
+inline void PrintMethodData(const char* method, uint64_t u) {
+ printf("%s, Data: '%" PRIu64 "'\n", method, u);
}
-inline void PrintInvalidDocument(const char* document) {
- printf("Fail document: %s\n\n", document);
+inline void PrintMethodData(const char* method, double d) {
+ printf("%s, Data: '%lf'\n", method, d);
}
-inline void PrintInvalidDocument(const wchar_t* document) {
- wprintf(L"Fail document: %ls\n\n", document);
+inline void PrintMethodData(const char* method, const char* s) {
+ printf("%s, Data: '%s'\n", method, s);
}
-inline void PrintValidatorPointers(unsigned depth, const char* s, const char* d) {
- printf("S: %*s%s\nD: %*s%s\n\n", depth * 4, " ", s, depth * 4, " ", d);
+inline void PrintMethodData(const char* method, const wchar_t* s) {
+ wprintf(L"%hs, Data: '%ls'\n", method, s);
}
-inline void PrintValidatorPointers(unsigned depth, const wchar_t* s, const wchar_t* d) {
- wprintf(L"S: %*ls%ls\nD: %*ls%ls\n\n", depth * 4, L" ", s, depth * 4, L" ", d);
+inline void PrintMethodData(const char* method, const char* s1, const char* s2) {
+ printf("%s, Data: '%s', '%s'\n", method, s1, s2);
+}
+
+inline void PrintMethodData(const char* method, const wchar_t* s1, const wchar_t* s2) {
+ wprintf(L"%hs, Data: '%ls', '%ls'\n", method, s1, s2);
}
} // namespace internal
#endif // RAPIDJSON_SCHEMA_VERBOSE
-///////////////////////////////////////////////////////////////////////////////
-// RAPIDJSON_INVALID_KEYWORD_RETURN
-
+#ifndef RAPIDJSON_SCHEMA_PRINT
#if RAPIDJSON_SCHEMA_VERBOSE
-#define RAPIDJSON_INVALID_KEYWORD_VERBOSE(keyword) internal::PrintInvalidKeyword(keyword)
+#define RAPIDJSON_SCHEMA_PRINT(name, ...) internal::Print##name##Data(__VA_ARGS__)
#else
-#define RAPIDJSON_INVALID_KEYWORD_VERBOSE(keyword)
+#define RAPIDJSON_SCHEMA_PRINT(name, ...)
+#endif
#endif
+///////////////////////////////////////////////////////////////////////////////
+// RAPIDJSON_INVALID_KEYWORD_RETURN
+
#define RAPIDJSON_INVALID_KEYWORD_RETURN(code)\
RAPIDJSON_MULTILINEMACRO_BEGIN\
context.invalidCode = code;\
context.invalidKeyword = SchemaType::GetValidateErrorKeyword(code).GetString();\
- RAPIDJSON_INVALID_KEYWORD_VERBOSE(context.invalidKeyword);\
+ RAPIDJSON_SCHEMA_PRINT(InvalidKeyword, context.invalidKeyword);\
return false;\
RAPIDJSON_MULTILINEMACRO_END
@@ -142,10 +184,54 @@ RAPIDJSON_MULTILINEMACRO_END
enum ValidateFlag {
kValidateNoFlags = 0, //!< No flags are set.
kValidateContinueOnErrorFlag = 1, //!< Don't stop after first validation error.
+ kValidateReadFlag = 2, //!< Validation is for a read semantic.
+ kValidateWriteFlag = 4, //!< Validation is for a write semantic.
kValidateDefaultFlags = RAPIDJSON_VALIDATE_DEFAULT_FLAGS //!< Default validate flags. Can be customized by defining RAPIDJSON_VALIDATE_DEFAULT_FLAGS
};
///////////////////////////////////////////////////////////////////////////////
+// Specification
+enum SchemaDraft {
+ kDraftUnknown = -1,
+ kDraftNone = 0,
+ kDraft03 = 3,
+ kDraftMin = 4, //!< Current minimum supported draft
+ kDraft04 = 4,
+ kDraft05 = 5,
+ kDraftMax = 5, //!< Current maximum supported draft
+ kDraft06 = 6,
+ kDraft07 = 7,
+ kDraft2019_09 = 8,
+ kDraft2020_12 = 9
+};
+
+enum OpenApiVersion {
+ kVersionUnknown = -1,
+ kVersionNone = 0,
+ kVersionMin = 2, //!< Current minimum supported version
+ kVersion20 = 2,
+ kVersion30 = 3,
+ kVersionMax = 3, //!< Current maximum supported version
+ kVersion31 = 4,
+};
+
+struct Specification {
+ Specification(SchemaDraft d) : draft(d), oapi(kVersionNone) {}
+ Specification(OpenApiVersion o) : oapi(o) {
+ if (oapi == kVersion20) draft = kDraft04;
+ else if (oapi == kVersion30) draft = kDraft05;
+ else if (oapi == kVersion31) draft = kDraft2020_12;
+ else draft = kDraft04;
+ }
+ ~Specification() {}
+ bool IsSupported() const {
+ return ((draft >= kDraftMin && draft <= kDraftMax) && ((oapi == kVersionNone) || (oapi >= kVersionMin && oapi <= kVersionMax)));
+ }
+ SchemaDraft draft;
+ OpenApiVersion oapi;
+};
+
+///////////////////////////////////////////////////////////////////////////////
// Forward declarations
template <typename ValueType, typename Allocator>
@@ -234,8 +320,11 @@ public:
virtual void EndDisallowedType(const typename SchemaType::ValueType& actualType) = 0;
virtual void NotAllOf(ISchemaValidator** subvalidators, SizeType count) = 0;
virtual void NoneOf(ISchemaValidator** subvalidators, SizeType count) = 0;
- virtual void NotOneOf(ISchemaValidator** subvalidators, SizeType count, bool matched) = 0;
+ virtual void NotOneOf(ISchemaValidator** subvalidators, SizeType count) = 0;
+ virtual void MultipleOneOf(SizeType index1, SizeType index2) = 0;
virtual void Disallowed() = 0;
+ virtual void DisallowedWhenWriting() = 0;
+ virtual void DisallowedWhenReading() = 0;
};
@@ -353,10 +442,11 @@ struct SchemaValidationContext {
kPatternValidatorWithAdditionalProperty
};
- SchemaValidationContext(SchemaValidatorFactoryType& f, ErrorHandlerType& eh, const SchemaType* s) :
+ SchemaValidationContext(SchemaValidatorFactoryType& f, ErrorHandlerType& eh, const SchemaType* s, unsigned fl = 0) :
factory(f),
error_handler(eh),
schema(s),
+ flags(fl),
valueSchema(),
invalidKeyword(),
invalidCode(),
@@ -380,13 +470,19 @@ struct SchemaValidationContext {
if (hasher)
factory.DestroryHasher(hasher);
if (validators) {
- for (SizeType i = 0; i < validatorCount; i++)
- factory.DestroySchemaValidator(validators[i]);
+ for (SizeType i = 0; i < validatorCount; i++) {
+ if (validators[i]) {
+ factory.DestroySchemaValidator(validators[i]);
+ }
+ }
factory.FreeState(validators);
}
if (patternPropertiesValidators) {
- for (SizeType i = 0; i < patternPropertiesValidatorCount; i++)
- factory.DestroySchemaValidator(patternPropertiesValidators[i]);
+ for (SizeType i = 0; i < patternPropertiesValidatorCount; i++) {
+ if (patternPropertiesValidators[i]) {
+ factory.DestroySchemaValidator(patternPropertiesValidators[i]);
+ }
+ }
factory.FreeState(patternPropertiesValidators);
}
if (patternPropertiesSchemas)
@@ -398,6 +494,7 @@ struct SchemaValidationContext {
SchemaValidatorFactoryType& factory;
ErrorHandlerType& error_handler;
const SchemaType* schema;
+ unsigned flags;
const SchemaType* valueSchema;
const Ch* invalidKeyword;
ValidateErrorCode invalidCode;
@@ -439,7 +536,8 @@ public:
Schema(SchemaDocumentType* schemaDocument, const PointerType& p, const ValueType& value, const ValueType& document, AllocatorType* allocator, const UriType& id = UriType()) :
allocator_(allocator),
uri_(schemaDocument->GetURI(), *allocator),
- id_(id),
+ id_(id, allocator),
+ spec_(schemaDocument->GetSpecification()),
pointer_(p, allocator),
typeless_(schemaDocument->GetTypeless()),
enum_(),
@@ -472,8 +570,15 @@ public:
maxLength_(~SizeType(0)),
exclusiveMinimum_(false),
exclusiveMaximum_(false),
- defaultValueLength_(0)
+ defaultValueLength_(0),
+ readOnly_(false),
+ writeOnly_(false),
+ nullable_(false)
{
+ GenericStringBuffer<EncodingType> sb;
+ p.StringifyUriFragment(sb);
+ RAPIDJSON_SCHEMA_PRINT(Method, "Schema::Schema", sb.GetString(), id.GetString());
+
typedef typename ValueType::ConstValueIterator ConstValueIterator;
typedef typename ValueType::ConstMemberIterator ConstMemberIterator;
@@ -492,10 +597,13 @@ public:
return;
// If we have an id property, resolve it with the in-scope id
+ // Not supported for open api 2.0 or 3.0
+ if (spec_.oapi != kVersion20 && spec_.oapi != kVersion30)
if (const ValueType* v = GetMember(value, GetIdString())) {
if (v->IsString()) {
UriType local(*v, allocator);
id_ = local.Resolve(id_, allocator);
+ RAPIDJSON_SCHEMA_PRINT(SchemaIds, id.GetString(), v->GetString(), id_.GetString());
}
}
@@ -512,9 +620,9 @@ public:
if (v->IsArray() && v->Size() > 0) {
enum_ = static_cast<uint64_t*>(allocator_->Malloc(sizeof(uint64_t) * v->Size()));
for (ConstValueIterator itr = v->Begin(); itr != v->End(); ++itr) {
- typedef Hasher<EncodingType, MemoryPoolAllocator<> > EnumHasherType;
+ typedef Hasher<EncodingType, MemoryPoolAllocator<AllocatorType> > EnumHasherType;
char buffer[256u + 24];
- MemoryPoolAllocator<> hasherAllocator(buffer, sizeof(buffer));
+ MemoryPoolAllocator<AllocatorType> hasherAllocator(buffer, sizeof(buffer));
EnumHasherType h(&hasherAllocator, 256);
itr->Accept(h);
enum_[enumCount_++] = h.GetHashCode();
@@ -522,8 +630,11 @@ public:
}
}
- if (schemaDocument) {
+ if (schemaDocument)
AssignIfExist(allOf_, *schemaDocument, p, value, GetAllOfString(), document);
+
+ // AnyOf, OneOf, Not not supported for open api 2.0
+ if (schemaDocument && spec_.oapi != kVersion20) {
AssignIfExist(anyOf_, *schemaDocument, p, value, GetAnyOfString(), document);
AssignIfExist(oneOf_, *schemaDocument, p, value, GetOneOfString(), document);
@@ -552,6 +663,8 @@ public:
if (itr->IsString())
AddUniqueElement(allProperties, *itr);
+ // Dependencies not supported for open api 2.0 and 3.0
+ if (spec_.oapi != kVersion20 && spec_.oapi != kVersion30)
if (dependencies && dependencies->IsObject())
for (ConstMemberIterator itr = dependencies->MemberBegin(); itr != dependencies->MemberEnd(); ++itr) {
AddUniqueElement(allProperties, itr->name);
@@ -581,6 +694,8 @@ public:
}
}
+ // PatternProperties not supported for open api 2.0 and 3.0
+ if (spec_.oapi != kVersion20 && spec_.oapi != kVersion30)
if (const ValueType* v = GetMember(value, GetPatternPropertiesString())) {
PointerType q = p.Append(GetPatternPropertiesString(), allocator_);
patternProperties_ = static_cast<PatternProperty*>(allocator_->Malloc(sizeof(PatternProperty) * v->MemberCount()));
@@ -588,8 +703,9 @@ public:
for (ConstMemberIterator itr = v->MemberBegin(); itr != v->MemberEnd(); ++itr) {
new (&patternProperties_[patternPropertyCount_]) PatternProperty();
- patternProperties_[patternPropertyCount_].pattern = CreatePattern(itr->name);
- schemaDocument->CreateSchema(&patternProperties_[patternPropertyCount_].schema, q.Append(itr->name, allocator_), itr->value, document, id_);
+ PointerType r = q.Append(itr->name, allocator_);
+ patternProperties_[patternPropertyCount_].pattern = CreatePattern(itr->name, schemaDocument, r);
+ schemaDocument->CreateSchema(&patternProperties_[patternPropertyCount_].schema, r, itr->value, document, id_);
patternPropertyCount_++;
}
}
@@ -604,6 +720,8 @@ public:
}
}
+ // Dependencies not supported for open api 2.0 and 3.0
+ if (spec_.oapi != kVersion20 && spec_.oapi != kVersion30)
if (dependencies && dependencies->IsObject()) {
PointerType q = p.Append(GetDependenciesString(), allocator_);
hasDependencies_ = true;
@@ -655,6 +773,8 @@ public:
AssignIfExist(minItems_, value, GetMinItemsString());
AssignIfExist(maxItems_, value, GetMaxItemsString());
+ // AdditionalItems not supported for openapi 2.0 and 3.0
+ if (spec_.oapi != kVersion20 && spec_.oapi != kVersion30)
if (const ValueType* v = GetMember(value, GetAdditionalItemsString())) {
if (v->IsBool())
additionalItems_ = v->GetBool();
@@ -669,7 +789,7 @@ public:
AssignIfExist(maxLength_, value, GetMaxLengthString());
if (const ValueType* v = GetMember(value, GetPatternString()))
- pattern_ = CreatePattern(*v);
+ pattern_ = CreatePattern(*v, schemaDocument, p.Append(GetPatternString(), allocator_));
// Number
if (const ValueType* v = GetMember(value, GetMinimumString()))
@@ -692,6 +812,23 @@ public:
if (v->IsString())
defaultValueLength_ = v->GetStringLength();
+ // ReadOnly - open api only (until draft 7 supported)
+ // WriteOnly - open api 3 only (until draft 7 supported)
+ // Both can't be true
+ if (spec_.oapi != kVersionNone)
+ AssignIfExist(readOnly_, value, GetReadOnlyString());
+ if (spec_.oapi >= kVersion30)
+ AssignIfExist(writeOnly_, value, GetWriteOnlyString());
+ if (readOnly_ && writeOnly_)
+ schemaDocument->SchemaError(kSchemaErrorReadOnlyAndWriteOnly, p);
+
+ // Nullable - open api 3 only
+ // If true add 'null' as allowable type
+ if (spec_.oapi >= kVersion30) {
+ AssignIfExist(nullable_, value, GetNullableString());
+ if (nullable_)
+ AddType(GetNullString());
+ }
}
~Schema() {
@@ -723,11 +860,16 @@ public:
return id_;
}
+ const Specification& GetSpecification() const {
+ return spec_;
+ }
+
const PointerType& GetPointer() const {
return pointer_;
}
bool BeginValue(Context& context) const {
+ RAPIDJSON_SCHEMA_PRINT(Method, "Schema::BeginValue");
if (context.inArray) {
if (uniqueItems_)
context.valueUniqueness = true;
@@ -759,6 +901,7 @@ public:
}
RAPIDJSON_FORCEINLINE bool EndValue(Context& context) const {
+ RAPIDJSON_SCHEMA_PRINT(Method, "Schema::EndValue");
// Only check pattern properties if we have validators
if (context.patternPropertiesValidatorCount > 0) {
bool otherValid = false;
@@ -822,16 +965,19 @@ public:
if (oneOf_.schemas) {
bool oneValid = false;
+ SizeType firstMatch = 0;
for (SizeType i = oneOf_.begin; i < oneOf_.begin + oneOf_.count; i++)
if (context.validators[i]->IsValid()) {
if (oneValid) {
- context.error_handler.NotOneOf(&context.validators[oneOf_.begin], oneOf_.count, true);
+ context.error_handler.MultipleOneOf(firstMatch, i - oneOf_.begin);
RAPIDJSON_INVALID_KEYWORD_RETURN(kValidateErrorOneOfMatch);
- } else
+ } else {
oneValid = true;
+ firstMatch = i - oneOf_.begin;
+ }
}
if (!oneValid) {
- context.error_handler.NotOneOf(&context.validators[oneOf_.begin], oneOf_.count, false);
+ context.error_handler.NotOneOf(&context.validators[oneOf_.begin], oneOf_.count);
RAPIDJSON_INVALID_KEYWORD_RETURN(kValidateErrorOneOf);
}
}
@@ -846,6 +992,7 @@ public:
}
bool Null(Context& context) const {
+ RAPIDJSON_SCHEMA_PRINT(Method, "Schema::Null");
if (!(type_ & (1 << kNullSchemaType))) {
DisallowedType(context, GetNullString());
RAPIDJSON_INVALID_KEYWORD_RETURN(kValidateErrorType);
@@ -853,39 +1000,43 @@ public:
return CreateParallelValidator(context);
}
- bool Bool(Context& context, bool) const {
- if (!(type_ & (1 << kBooleanSchemaType))) {
- DisallowedType(context, GetBooleanString());
- RAPIDJSON_INVALID_KEYWORD_RETURN(kValidateErrorType);
- }
+ bool Bool(Context& context, bool b) const {
+ RAPIDJSON_SCHEMA_PRINT(Method, "Schema::Bool", b);
+ if (!CheckBool(context, b))
+ return false;
return CreateParallelValidator(context);
}
bool Int(Context& context, int i) const {
+ RAPIDJSON_SCHEMA_PRINT(Method, "Schema::Int", (int64_t)i);
if (!CheckInt(context, i))
return false;
return CreateParallelValidator(context);
}
bool Uint(Context& context, unsigned u) const {
+ RAPIDJSON_SCHEMA_PRINT(Method, "Schema::Uint", (uint64_t)u);
if (!CheckUint(context, u))
return false;
return CreateParallelValidator(context);
}
bool Int64(Context& context, int64_t i) const {
+ RAPIDJSON_SCHEMA_PRINT(Method, "Schema::Int64", i);
if (!CheckInt(context, i))
return false;
return CreateParallelValidator(context);
}
bool Uint64(Context& context, uint64_t u) const {
+ RAPIDJSON_SCHEMA_PRINT(Method, "Schema::Uint64", u);
if (!CheckUint(context, u))
return false;
return CreateParallelValidator(context);
}
bool Double(Context& context, double d) const {
+ RAPIDJSON_SCHEMA_PRINT(Method, "Schema::Double", d);
if (!(type_ & (1 << kNumberSchemaType))) {
DisallowedType(context, GetNumberString());
RAPIDJSON_INVALID_KEYWORD_RETURN(kValidateErrorType);
@@ -904,6 +1055,7 @@ public:
}
bool String(Context& context, const Ch* str, SizeType length, bool) const {
+ RAPIDJSON_SCHEMA_PRINT(Method, "Schema::String", str);
if (!(type_ & (1 << kStringSchemaType))) {
DisallowedType(context, GetStringString());
RAPIDJSON_INVALID_KEYWORD_RETURN(kValidateErrorType);
@@ -932,6 +1084,7 @@ public:
}
bool StartObject(Context& context) const {
+ RAPIDJSON_SCHEMA_PRINT(Method, "Schema::StartObject");
if (!(type_ & (1 << kObjectSchemaType))) {
DisallowedType(context, GetObjectString());
RAPIDJSON_INVALID_KEYWORD_RETURN(kValidateErrorType);
@@ -953,6 +1106,8 @@ public:
}
bool Key(Context& context, const Ch* str, SizeType len, bool) const {
+ RAPIDJSON_SCHEMA_PRINT(Method, "Schema::Key", str);
+
if (patternProperties_) {
context.patternPropertiesSchemaCount = 0;
for (SizeType i = 0; i < patternPropertyCount_; i++)
@@ -1004,6 +1159,7 @@ public:
}
bool EndObject(Context& context, SizeType memberCount) const {
+ RAPIDJSON_SCHEMA_PRINT(Method, "Schema::EndObject");
if (hasRequired_) {
context.error_handler.StartMissingProperties();
for (SizeType index = 0; index < propertyCount_; index++)
@@ -1051,6 +1207,7 @@ public:
}
bool StartArray(Context& context) const {
+ RAPIDJSON_SCHEMA_PRINT(Method, "Schema::StartArray");
context.arrayElementIndex = 0;
context.inArray = true; // Ensure we note that we are in an array
@@ -1063,6 +1220,7 @@ public:
}
bool EndArray(Context& context, SizeType elementCount) const {
+ RAPIDJSON_SCHEMA_PRINT(Method, "Schema::EndArray");
context.inArray = false;
if (elementCount < minItems_) {
@@ -1111,6 +1269,9 @@ public:
case kValidateErrorAnyOf: return GetAnyOfString();
case kValidateErrorNot: return GetNotString();
+ case kValidateErrorReadOnly: return GetReadOnlyString();
+ case kValidateErrorWriteOnly: return GetWriteOnlyString();
+
default: return GetNullString();
}
}
@@ -1158,15 +1319,14 @@ public:
RAPIDJSON_STRING_(ExclusiveMaximum, 'e', 'x', 'c', 'l', 'u', 's', 'i', 'v', 'e', 'M', 'a', 'x', 'i', 'm', 'u', 'm')
RAPIDJSON_STRING_(MultipleOf, 'm', 'u', 'l', 't', 'i', 'p', 'l', 'e', 'O', 'f')
RAPIDJSON_STRING_(DefaultValue, 'd', 'e', 'f', 'a', 'u', 'l', 't')
+ RAPIDJSON_STRING_(Schema, '$', 's', 'c', 'h', 'e', 'm', 'a')
RAPIDJSON_STRING_(Ref, '$', 'r', 'e', 'f')
RAPIDJSON_STRING_(Id, 'i', 'd')
-
- RAPIDJSON_STRING_(SchemeEnd, ':')
- RAPIDJSON_STRING_(AuthStart, '/', '/')
- RAPIDJSON_STRING_(QueryStart, '?')
- RAPIDJSON_STRING_(FragStart, '#')
- RAPIDJSON_STRING_(Slash, '/')
- RAPIDJSON_STRING_(Dot, '.')
+ RAPIDJSON_STRING_(Swagger, 's', 'w', 'a', 'g', 'g', 'e', 'r')
+ RAPIDJSON_STRING_(OpenApi, 'o', 'p', 'e', 'n', 'a', 'p', 'i')
+ RAPIDJSON_STRING_(ReadOnly, 'r', 'e', 'a', 'd', 'O', 'n', 'l', 'y')
+ RAPIDJSON_STRING_(WriteOnly, 'w', 'r', 'i', 't', 'e', 'O', 'n', 'l', 'y')
+ RAPIDJSON_STRING_(Nullable, 'n', 'u', 'l', 'l', 'a', 'b', 'l', 'e')
#undef RAPIDJSON_STRING_
@@ -1241,10 +1401,11 @@ private:
#if RAPIDJSON_SCHEMA_USE_INTERNALREGEX
template <typename ValueType>
- RegexType* CreatePattern(const ValueType& value) {
+ RegexType* CreatePattern(const ValueType& value, SchemaDocumentType* sd, const PointerType& p) {
if (value.IsString()) {
RegexType* r = new (allocator_->Malloc(sizeof(RegexType))) RegexType(value.GetString(), allocator_);
if (!r->IsValid()) {
+ sd->SchemaErrorValue(kSchemaErrorRegexInvalid, p, value.GetString(), value.GetStringLength());
r->~RegexType();
AllocatorType::Free(r);
r = 0;
@@ -1260,13 +1421,14 @@ private:
}
#elif RAPIDJSON_SCHEMA_USE_STDREGEX
template <typename ValueType>
- RegexType* CreatePattern(const ValueType& value) {
+ RegexType* CreatePattern(const ValueType& value, SchemaDocumentType* sd, const PointerType& p) {
if (value.IsString()) {
RegexType *r = static_cast<RegexType*>(allocator_->Malloc(sizeof(RegexType)));
try {
return new (r) RegexType(value.GetString(), std::size_t(value.GetStringLength()), std::regex_constants::ECMAScript);
}
- catch (const std::regex_error&) {
+ catch (const std::regex_error& e) {
+ sd->SchemaErrorValue(kSchemaErrorRegexInvalid, p, value.GetString(), value.GetStringLength());
AllocatorType::Free(r);
}
}
@@ -1279,7 +1441,9 @@ private:
}
#else
template <typename ValueType>
- RegexType* CreatePattern(const ValueType&) { return 0; }
+ RegexType* CreatePattern(const ValueType&) {
+ return 0;
+ }
static bool IsPatternMatch(const RegexType*, const Ch *, SizeType) { return true; }
#endif // RAPIDJSON_SCHEMA_USE_STDREGEX
@@ -1294,6 +1458,9 @@ private:
else if (type == GetNumberString() ) type_ |= (1 << kNumberSchemaType) | (1 << kIntegerSchemaType);
}
+ // Creates parallel validators for allOf, anyOf, oneOf, not and schema dependencies, if required.
+ // Also creates a hasher for enums and array uniqueness, if required.
+ // Also a useful place to add type-independent error checks.
bool CreateParallelValidator(Context& context) const {
if (enum_ || context.arrayUniqueness)
context.hasher = context.factory.CreateHasher();
@@ -1301,6 +1468,7 @@ private:
if (validatorCount_) {
RAPIDJSON_ASSERT(context.validators == 0);
context.validators = static_cast<ISchemaValidator**>(context.factory.MallocState(sizeof(ISchemaValidator*) * validatorCount_));
+ std::memset(context.validators, 0, sizeof(ISchemaValidator*) * validatorCount_);
context.validatorCount = validatorCount_;
// Always return after first failure for these sub-validators
@@ -1323,6 +1491,16 @@ private:
}
}
+ // Add any other type-independent checks here
+ if (readOnly_ && (context.flags & kValidateWriteFlag)) {
+ context.error_handler.DisallowedWhenWriting();
+ RAPIDJSON_INVALID_KEYWORD_RETURN(kValidateErrorReadOnly);
+ }
+ if (writeOnly_ && (context.flags & kValidateReadFlag)) {
+ context.error_handler.DisallowedWhenReading();
+ RAPIDJSON_INVALID_KEYWORD_RETURN(kValidateErrorWriteOnly);
+ }
+
return true;
}
@@ -1345,6 +1523,14 @@ private:
return false;
}
+ bool CheckBool(Context& context, bool) const {
+ if (!(type_ & (1 << kBooleanSchemaType))) {
+ DisallowedType(context, GetBooleanString());
+ RAPIDJSON_INVALID_KEYWORD_RETURN(kValidateErrorType);
+ }
+ return true;
+ }
+
bool CheckInt(Context& context, int64_t i) const {
if (!(type_ & ((1 << kIntegerSchemaType) | (1 << kNumberSchemaType)))) {
DisallowedType(context, GetIntegerString());
@@ -1510,6 +1696,7 @@ private:
AllocatorType* allocator_;
SValue uri_;
UriType id_;
+ Specification spec_;
PointerType pointer_;
const SchemaType* typeless_;
uint64_t* enum_;
@@ -1554,6 +1741,10 @@ private:
bool exclusiveMaximum_;
SizeType defaultValueLength_;
+
+ bool readOnly_;
+ bool writeOnly_;
+ bool nullable_;
};
template<typename Stack, typename Ch>
@@ -1600,7 +1791,13 @@ public:
virtual ~IGenericRemoteSchemaDocumentProvider() {}
virtual const SchemaDocumentType* GetRemoteDocument(const Ch* uri, SizeType length) = 0;
- virtual const SchemaDocumentType* GetRemoteDocument(GenericUri<ValueType, AllocatorType> uri) { return GetRemoteDocument(uri.GetBaseString(), uri.GetBaseStringLength()); }
+ virtual const SchemaDocumentType* GetRemoteDocument(const GenericUri<ValueType, AllocatorType> uri, Specification& spec) {
+ // Default implementation just calls through for compatibility
+ // Following line suppresses unused parameter warning
+ (void)spec;
+ // printf("GetRemoteDocument: %d %d\n", spec.draft, spec.oapi);
+ return GetRemoteDocument(uri.GetBaseString(), uri.GetBaseStringLength());
+ }
};
///////////////////////////////////////////////////////////////////////////////
@@ -1625,8 +1822,9 @@ public:
typedef typename EncodingType::Ch Ch;
typedef internal::Schema<GenericSchemaDocument> SchemaType;
typedef GenericPointer<ValueType, Allocator> PointerType;
- typedef GenericValue<EncodingType, AllocatorType> SValue;
+ typedef GenericValue<EncodingType, AllocatorType> GValue;
typedef GenericUri<ValueType, Allocator> UriType;
+ typedef GenericStringRef<Ch> StringRefType;
friend class internal::Schema<GenericSchemaDocument>;
template <typename, typename, typename>
friend class GenericSchemaValidator;
@@ -1641,18 +1839,24 @@ public:
\param remoteProvider An optional remote schema document provider for resolving remote reference. Can be null.
\param allocator An optional allocator instance for allocating memory. Can be null.
\param pointer An optional JSON pointer to the start of the schema document
+ \param spec Optional schema draft or OpenAPI version. Used if no specification in document. Defaults to draft-04.
*/
explicit GenericSchemaDocument(const ValueType& document, const Ch* uri = 0, SizeType uriLength = 0,
IRemoteSchemaDocumentProviderType* remoteProvider = 0, Allocator* allocator = 0,
- const PointerType& pointer = PointerType()) : // PR #1393
+ const PointerType& pointer = PointerType(), // PR #1393
+ const Specification& spec = Specification(kDraft04)) :
remoteProvider_(remoteProvider),
allocator_(allocator),
ownAllocator_(),
root_(),
typeless_(),
schemaMap_(allocator, kInitialSchemaMapSize),
- schemaRef_(allocator, kInitialSchemaRefSize)
+ schemaRef_(allocator, kInitialSchemaRefSize),
+ spec_(spec),
+ error_(kObjectType),
+ currentError_()
{
+ RAPIDJSON_SCHEMA_PRINT(Method, "GenericSchemaDocument::GenericSchemaDocument");
if (!allocator_)
ownAllocator_ = allocator_ = RAPIDJSON_NEW(Allocator)();
@@ -1663,6 +1867,10 @@ public:
typeless_ = static_cast<SchemaType*>(allocator_->Malloc(sizeof(SchemaType)));
new (typeless_) SchemaType(this, PointerType(), ValueType(kObjectType).Move(), ValueType(kObjectType).Move(), allocator_, docId_);
+ // Establish the schema draft or open api version.
+ // We only ever look for '$schema' or 'swagger' or 'openapi' at the root of the document.
+ SetSchemaSpecification(document);
+
// Generate root schema, it will call CreateSchema() to create sub-schemas,
// And call HandleRefSchema() if there are $ref.
// PR #1393 use input pointer if supplied
@@ -1673,6 +1881,11 @@ public:
else if (const ValueType* v = pointer.Get(document)) {
CreateSchema(&root_, pointer, *v, document, docId_);
}
+ else {
+ GenericStringBuffer<EncodingType> sb;
+ pointer.StringifyUriFragment(sb);
+ SchemaErrorValue(kSchemaErrorStartUnknown, PointerType(), sb.GetString(), static_cast<SizeType>(sb.GetSize() / sizeof(Ch)));
+ }
RAPIDJSON_ASSERT(root_ != 0);
@@ -1690,7 +1903,10 @@ public:
schemaMap_(std::move(rhs.schemaMap_)),
schemaRef_(std::move(rhs.schemaRef_)),
uri_(std::move(rhs.uri_)),
- docId_(rhs.docId_)
+ docId_(std::move(rhs.docId_)),
+ spec_(rhs.spec_),
+ error_(std::move(rhs.error_)),
+ currentError_(std::move(rhs.currentError_))
{
rhs.remoteProvider_ = 0;
rhs.allocator_ = 0;
@@ -1709,15 +1925,81 @@ public:
Allocator::Free(typeless_);
}
+ // these may contain some allocator data so clear before deleting ownAllocator_
+ uri_.SetNull();
+ error_.SetNull();
+ currentError_.SetNull();
+
RAPIDJSON_DELETE(ownAllocator_);
}
- const SValue& GetURI() const { return uri_; }
+ const GValue& GetURI() const { return uri_; }
+
+ const Specification& GetSpecification() const { return spec_; }
+ bool IsSupportedSpecification() const { return spec_.IsSupported(); }
+
+ //! Static method to get the specification of any schema document
+ // Returns kDraftNone if document is silent
+ static const Specification GetSpecification(const ValueType& document) {
+ SchemaDraft draft = GetSchemaDraft(document);
+ if (draft != kDraftNone)
+ return Specification(draft);
+ else {
+ OpenApiVersion oapi = GetOpenApiVersion(document);
+ if (oapi != kVersionNone)
+ return Specification(oapi);
+ }
+ return Specification(kDraftNone);
+ }
//! Get the root schema.
const SchemaType& GetRoot() const { return *root_; }
-private:
+ //! Gets the error object.
+ GValue& GetError() { return error_; }
+ const GValue& GetError() const { return error_; }
+
+ static const StringRefType& GetSchemaErrorKeyword(SchemaErrorCode schemaErrorCode) {
+ switch (schemaErrorCode) {
+ case kSchemaErrorStartUnknown: return GetStartUnknownString();
+ case kSchemaErrorRefPlainName: return GetRefPlainNameString();
+ case kSchemaErrorRefInvalid: return GetRefInvalidString();
+ case kSchemaErrorRefPointerInvalid: return GetRefPointerInvalidString();
+ case kSchemaErrorRefUnknown: return GetRefUnknownString();
+ case kSchemaErrorRefCyclical: return GetRefCyclicalString();
+ case kSchemaErrorRefNoRemoteProvider: return GetRefNoRemoteProviderString();
+ case kSchemaErrorRefNoRemoteSchema: return GetRefNoRemoteSchemaString();
+ case kSchemaErrorRegexInvalid: return GetRegexInvalidString();
+ case kSchemaErrorSpecUnknown: return GetSpecUnknownString();
+ case kSchemaErrorSpecUnsupported: return GetSpecUnsupportedString();
+ case kSchemaErrorSpecIllegal: return GetSpecIllegalString();
+ case kSchemaErrorReadOnlyAndWriteOnly: return GetReadOnlyAndWriteOnlyString();
+ default: return GetNullString();
+ }
+ }
+
+ //! Default error method
+ void SchemaError(const SchemaErrorCode code, const PointerType& location) {
+ currentError_ = GValue(kObjectType);
+ AddCurrentError(code, location);
+ }
+
+ //! Method for error with single string value insert
+ void SchemaErrorValue(const SchemaErrorCode code, const PointerType& location, const Ch* value, SizeType length) {
+ currentError_ = GValue(kObjectType);
+ currentError_.AddMember(GetValueString(), GValue(value, length, *allocator_).Move(), *allocator_);
+ AddCurrentError(code, location);
+ }
+
+ //! Method for error with invalid pointer
+ void SchemaErrorPointer(const SchemaErrorCode code, const PointerType& location, const Ch* value, SizeType length, const PointerType& pointer) {
+ currentError_ = GValue(kObjectType);
+ currentError_.AddMember(GetValueString(), GValue(value, length, *allocator_).Move(), *allocator_);
+ currentError_.AddMember(GetOffsetString(), static_cast<SizeType>(pointer.GetParseErrorOffset() / sizeof(Ch)), *allocator_);
+ AddCurrentError(code, location);
+ }
+
+ private:
//! Prohibit copying
GenericSchemaDocument(const GenericSchemaDocument&);
//! Prohibit assignment
@@ -1738,6 +2020,146 @@ private:
bool owned;
};
+ void AddErrorInstanceLocation(GValue& result, const PointerType& location) {
+ GenericStringBuffer<EncodingType> sb;
+ location.StringifyUriFragment(sb);
+ GValue instanceRef(sb.GetString(), static_cast<SizeType>(sb.GetSize() / sizeof(Ch)), *allocator_);
+ result.AddMember(GetInstanceRefString(), instanceRef, *allocator_);
+ }
+
+ void AddError(GValue& keyword, GValue& error) {
+ typename GValue::MemberIterator member = error_.FindMember(keyword);
+ if (member == error_.MemberEnd())
+ error_.AddMember(keyword, error, *allocator_);
+ else {
+ if (member->value.IsObject()) {
+ GValue errors(kArrayType);
+ errors.PushBack(member->value, *allocator_);
+ member->value = errors;
+ }
+ member->value.PushBack(error, *allocator_);
+ }
+ }
+
+ void AddCurrentError(const SchemaErrorCode code, const PointerType& location) {
+ RAPIDJSON_SCHEMA_PRINT(InvalidKeyword, GetSchemaErrorKeyword(code));
+ currentError_.AddMember(GetErrorCodeString(), code, *allocator_);
+ AddErrorInstanceLocation(currentError_, location);
+ AddError(GValue(GetSchemaErrorKeyword(code)).Move(), currentError_);
+ }
+
+#define RAPIDJSON_STRING_(name, ...) \
+ static const StringRefType& Get##name##String() {\
+ static const Ch s[] = { __VA_ARGS__, '\0' };\
+ static const StringRefType v(s, static_cast<SizeType>(sizeof(s) / sizeof(Ch) - 1)); \
+ return v;\
+ }
+
+ RAPIDJSON_STRING_(InstanceRef, 'i', 'n', 's', 't', 'a', 'n', 'c', 'e', 'R', 'e', 'f')
+ RAPIDJSON_STRING_(ErrorCode, 'e', 'r', 'r', 'o', 'r', 'C', 'o', 'd', 'e')
+ RAPIDJSON_STRING_(Value, 'v', 'a', 'l', 'u', 'e')
+ RAPIDJSON_STRING_(Offset, 'o', 'f', 'f', 's', 'e', 't')
+
+ RAPIDJSON_STRING_(Null, 'n', 'u', 'l', 'l')
+ RAPIDJSON_STRING_(SpecUnknown, 'S', 'p', 'e', 'c', 'U', 'n', 'k', 'n', 'o', 'w', 'n')
+ RAPIDJSON_STRING_(SpecUnsupported, 'S', 'p', 'e', 'c', 'U', 'n', 's', 'u', 'p', 'p', 'o', 'r', 't', 'e', 'd')
+ RAPIDJSON_STRING_(SpecIllegal, 'S', 'p', 'e', 'c', 'I', 'l', 'l', 'e', 'g', 'a', 'l')
+ RAPIDJSON_STRING_(StartUnknown, 'S', 't', 'a', 'r', 't', 'U', 'n', 'k', 'n', 'o', 'w', 'n')
+ RAPIDJSON_STRING_(RefPlainName, 'R', 'e', 'f', 'P', 'l', 'a', 'i', 'n', 'N', 'a', 'm', 'e')
+ RAPIDJSON_STRING_(RefInvalid, 'R', 'e', 'f', 'I', 'n', 'v', 'a', 'l', 'i', 'd')
+ RAPIDJSON_STRING_(RefPointerInvalid, 'R', 'e', 'f', 'P', 'o', 'i', 'n', 't', 'e', 'r', 'I', 'n', 'v', 'a', 'l', 'i', 'd')
+ RAPIDJSON_STRING_(RefUnknown, 'R', 'e', 'f', 'U', 'n', 'k', 'n', 'o', 'w', 'n')
+ RAPIDJSON_STRING_(RefCyclical, 'R', 'e', 'f', 'C', 'y', 'c', 'l', 'i', 'c', 'a', 'l')
+ RAPIDJSON_STRING_(RefNoRemoteProvider, 'R', 'e', 'f', 'N', 'o', 'R', 'e', 'm', 'o', 't', 'e', 'P', 'r', 'o', 'v', 'i', 'd', 'e', 'r')
+ RAPIDJSON_STRING_(RefNoRemoteSchema, 'R', 'e', 'f', 'N', 'o', 'R', 'e', 'm', 'o', 't', 'e', 'S', 'c', 'h', 'e', 'm', 'a')
+ RAPIDJSON_STRING_(ReadOnlyAndWriteOnly, 'R', 'e', 'a', 'd', 'O', 'n', 'l', 'y', 'A', 'n', 'd', 'W', 'r', 'i', 't', 'e', 'O', 'n', 'l', 'y')
+ RAPIDJSON_STRING_(RegexInvalid, 'R', 'e', 'g', 'e', 'x', 'I', 'n', 'v', 'a', 'l', 'i', 'd')
+
+#undef RAPIDJSON_STRING_
+
+ // Static method to get schema draft of any schema document
+ static SchemaDraft GetSchemaDraft(const ValueType& document) {
+ static const Ch kDraft03String[] = { 'h', 't', 't', 'p', ':', '/', '/', 'j', 's', 'o', 'n', '-', 's', 'c', 'h', 'e', 'm', 'a', '.', 'o', 'r', 'g', '/', 'd', 'r', 'a', 'f', 't', '-', '0', '3', '/', 's', 'c', 'h', 'e', 'm', 'a', '#', '\0' };
+ static const Ch kDraft04String[] = { 'h', 't', 't', 'p', ':', '/', '/', 'j', 's', 'o', 'n', '-', 's', 'c', 'h', 'e', 'm', 'a', '.', 'o', 'r', 'g', '/', 'd', 'r', 'a', 'f', 't', '-', '0', '4', '/', 's', 'c', 'h', 'e', 'm', 'a', '#', '\0' };
+ static const Ch kDraft05String[] = { 'h', 't', 't', 'p', ':', '/', '/', 'j', 's', 'o', 'n', '-', 's', 'c', 'h', 'e', 'm', 'a', '.', 'o', 'r', 'g', '/', 'd', 'r', 'a', 'f', 't', '-', '0', '5', '/', 's', 'c', 'h', 'e', 'm', 'a', '#', '\0' };
+ static const Ch kDraft06String[] = { 'h', 't', 't', 'p', ':', '/', '/', 'j', 's', 'o', 'n', '-', 's', 'c', 'h', 'e', 'm', 'a', '.', 'o', 'r', 'g', '/', 'd', 'r', 'a', 'f', 't', '-', '0', '6', '/', 's', 'c', 'h', 'e', 'm', 'a', '#', '\0' };
+ static const Ch kDraft07String[] = { 'h', 't', 't', 'p', ':', '/', '/', 'j', 's', 'o', 'n', '-', 's', 'c', 'h', 'e', 'm', 'a', '.', 'o', 'r', 'g', '/', 'd', 'r', 'a', 'f', 't', '-', '0', '7', '/', 's', 'c', 'h', 'e', 'm', 'a', '#', '\0' };
+ static const Ch kDraft2019_09String[] = { 'h', 't', 't', 'p', 's', ':', '/', '/', 'j', 's', 'o', 'n', '-', 's', 'c', 'h', 'e', 'm', 'a', '.', 'o', 'r', 'g', '/', 'd', 'r', 'a', 'f', 't', '/', '2', '0', '1', '9', '-', '0', '9', '/', 's', 'c', 'h', 'e', 'm', 'a', '\0' };
+ static const Ch kDraft2020_12String[] = { 'h', 't', 't', 'p', 's', ':', '/', '/', 'j', 's', 'o', 'n', '-', 's', 'c', 'h', 'e', 'm', 'a', '.', 'o', 'r', 'g', '/', 'd', 'r', 'a', 'f', 't', '/', '2', '0', '2', '0', '-', '1', '2', '/', 's', 'c', 'h', 'e', 'm', 'a', '\0' };
+
+ if (!document.IsObject()) {
+ return kDraftNone;
+ }
+
+ // Get the schema draft from the $schema keyword at the supplied location
+ typename ValueType::ConstMemberIterator itr = document.FindMember(SchemaType::GetSchemaString());
+ if (itr != document.MemberEnd()) {
+ if (!itr->value.IsString()) return kDraftUnknown;
+ const UriType draftUri(itr->value);
+ // Check base uri for match
+ if (draftUri.Match(UriType(kDraft04String), false)) return kDraft04;
+ if (draftUri.Match(UriType(kDraft05String), false)) return kDraft05;
+ if (draftUri.Match(UriType(kDraft06String), false)) return kDraft06;
+ if (draftUri.Match(UriType(kDraft07String), false)) return kDraft07;
+ if (draftUri.Match(UriType(kDraft03String), false)) return kDraft03;
+ if (draftUri.Match(UriType(kDraft2019_09String), false)) return kDraft2019_09;
+ if (draftUri.Match(UriType(kDraft2020_12String), false)) return kDraft2020_12;
+ return kDraftUnknown;
+ }
+ // $schema not found
+ return kDraftNone;
+ }
+
+
+ // Get open api version of any schema document
+ static OpenApiVersion GetOpenApiVersion(const ValueType& document) {
+ static const Ch kVersion20String[] = { '2', '.', '0', '\0' };
+ static const Ch kVersion30String[] = { '3', '.', '0', '.', '\0' }; // ignore patch level
+ static const Ch kVersion31String[] = { '3', '.', '1', '.', '\0' }; // ignore patch level
+ static SizeType len = internal::StrLen<Ch>(kVersion30String);
+
+ if (!document.IsObject()) {
+ return kVersionNone;
+ }
+
+ // Get the open api version from the swagger / openapi keyword at the supplied location
+ typename ValueType::ConstMemberIterator itr = document.FindMember(SchemaType::GetSwaggerString());
+ if (itr == document.MemberEnd()) itr = document.FindMember(SchemaType::GetOpenApiString());
+ if (itr != document.MemberEnd()) {
+ if (!itr->value.IsString()) return kVersionUnknown;
+ const ValueType kVersion20Value(kVersion20String);
+ if (kVersion20Value == itr->value) return kVersion20; // must match 2.0 exactly
+ const ValueType kVersion30Value(kVersion30String);
+ if (itr->value.GetStringLength() > len && kVersion30Value == ValueType(itr->value.GetString(), len)) return kVersion30; // must match 3.0.x
+ const ValueType kVersion31Value(kVersion31String);
+ if (itr->value.GetStringLength() > len && kVersion31Value == ValueType(itr->value.GetString(), len)) return kVersion31; // must match 3.1.x
+ return kVersionUnknown;
+ }
+ // swagger or openapi not found
+ return kVersionNone;
+ }
+
+ // Get the draft of the schema or the open api version (which implies the draft).
+ // Report an error if schema draft or open api version not supported or not recognized, or both in document, and carry on.
+ void SetSchemaSpecification(const ValueType& document) {
+ // Look for '$schema', 'swagger' or 'openapi' keyword at document root
+ SchemaDraft docDraft = GetSchemaDraft(document);
+ OpenApiVersion docOapi = GetOpenApiVersion(document);
+ // Error if both in document
+ if (docDraft != kDraftNone && docOapi != kVersionNone)
+ SchemaError(kSchemaErrorSpecIllegal, PointerType());
+ // Use document draft or open api version if present or use spec from constructor
+ if (docDraft != kDraftNone)
+ spec_ = Specification(docDraft);
+ else if (docOapi != kVersionNone)
+ spec_ = Specification(docOapi);
+ // Error if draft or version unknown
+ if (spec_.draft == kDraftUnknown || spec_.oapi == kVersionUnknown)
+ SchemaError(kSchemaErrorSpecUnknown, PointerType());
+ else if (!spec_.IsSupported())
+ SchemaError(kSchemaErrorSpecUnsupported, PointerType());
+ }
+
// Changed by PR #1393
void CreateSchemaRecursive(const SchemaType** schema, const PointerType& pointer, const ValueType& v, const ValueType& document, const UriType& id) {
if (v.GetType() == kObjectType) {
@@ -1754,6 +2176,9 @@ private:
// Changed by PR #1393
const UriType& CreateSchema(const SchemaType** schema, const PointerType& pointer, const ValueType& v, const ValueType& document, const UriType& id) {
RAPIDJSON_ASSERT(pointer.IsValid());
+ GenericStringBuffer<EncodingType> sb;
+ pointer.StringifyUriFragment(sb);
+ RAPIDJSON_SCHEMA_PRINT(Method, "GenericSchemaDocument::CreateSchema", sb.GetString(), id.GetString());
if (v.IsObject()) {
if (const SchemaType* sc = GetSchema(pointer)) {
if (schema)
@@ -1783,41 +2208,53 @@ private:
if (itr == v.MemberEnd())
return false;
+ GenericStringBuffer<EncodingType> sb;
+ source.StringifyUriFragment(sb);
+ RAPIDJSON_SCHEMA_PRINT(Method, "GenericSchemaDocument::HandleRefSchema", sb.GetString(), id.GetString());
// Resolve the source pointer to the $ref'ed schema (finally)
new (schemaRef_.template Push<SchemaRefPtr>()) SchemaRefPtr(&source);
if (itr->value.IsString()) {
SizeType len = itr->value.GetStringLength();
- if (len > 0) {
+ if (len == 0)
+ SchemaError(kSchemaErrorRefInvalid, source);
+ else {
// First resolve $ref against the in-scope id
UriType scopeId = UriType(id, allocator_);
UriType ref = UriType(itr->value, allocator_).Resolve(scopeId, allocator_);
+ RAPIDJSON_SCHEMA_PRINT(SchemaIds, id.GetString(), itr->value.GetString(), ref.GetString());
// See if the resolved $ref minus the fragment matches a resolved id in this document
// Search from the root. Returns the subschema in the document and its absolute JSON pointer.
PointerType basePointer = PointerType();
const ValueType *base = FindId(document, ref, basePointer, docId_, false);
if (!base) {
// Remote reference - call the remote document provider
- if (remoteProvider_) {
- if (const GenericSchemaDocument* remoteDocument = remoteProvider_->GetRemoteDocument(ref)) {
+ if (!remoteProvider_)
+ SchemaError(kSchemaErrorRefNoRemoteProvider, source);
+ else {
+ if (const GenericSchemaDocument* remoteDocument = remoteProvider_->GetRemoteDocument(ref, spec_)) {
const Ch* s = ref.GetFragString();
len = ref.GetFragStringLength();
if (len <= 1 || s[1] == '/') {
// JSON pointer fragment, absolute in the remote schema
const PointerType pointer(s, len, allocator_);
- if (pointer.IsValid()) {
+ if (!pointer.IsValid())
+ SchemaErrorPointer(kSchemaErrorRefPointerInvalid, source, s, len, pointer);
+ else {
// Get the subschema
if (const SchemaType *sc = remoteDocument->GetSchema(pointer)) {
if (schema)
*schema = sc;
AddSchemaRefs(const_cast<SchemaType *>(sc));
return true;
- }
+ } else
+ SchemaErrorValue(kSchemaErrorRefUnknown, source, ref.GetString(), ref.GetStringLength());
}
- } else {
- // Plain name fragment, not allowed
- }
- }
+ } else
+ // Plain name fragment, not allowed in remote schema
+ SchemaErrorValue(kSchemaErrorRefPlainName, source, s, len);
+ } else
+ SchemaErrorValue(kSchemaErrorRefNoRemoteSchema, source, ref.GetString(), ref.GetStringLength());
}
}
else { // Local reference
@@ -1826,16 +2263,18 @@ private:
if (len <= 1 || s[1] == '/') {
// JSON pointer fragment, relative to the resolved URI
const PointerType relPointer(s, len, allocator_);
- if (relPointer.IsValid()) {
+ if (!relPointer.IsValid())
+ SchemaErrorPointer(kSchemaErrorRefPointerInvalid, source, s, len, relPointer);
+ else {
// Get the subschema
if (const ValueType *pv = relPointer.Get(*base)) {
// Now get the absolute JSON pointer by adding relative to base
- PointerType pointer(basePointer);
+ PointerType pointer(basePointer, allocator_);
for (SizeType i = 0; i < relPointer.GetTokenCount(); i++)
pointer = pointer.Append(relPointer.GetTokens()[i], allocator_);
- //GenericStringBuffer<EncodingType> sb;
- //pointer.StringifyUriFragment(sb);
- if (pointer.IsValid() && !IsCyclicRef(pointer)) {
+ if (IsCyclicRef(pointer))
+ SchemaErrorValue(kSchemaErrorRefCyclical, source, ref.GetString(), ref.GetStringLength());
+ else {
// Call CreateSchema recursively, but first compute the in-scope id for the $ref target as we have jumped there
// TODO: cache pointer <-> id mapping
size_t unresolvedTokenIndex;
@@ -1843,17 +2282,21 @@ private:
CreateSchema(schema, pointer, *pv, document, scopeId);
return true;
}
- }
+ } else
+ SchemaErrorValue(kSchemaErrorRefUnknown, source, ref.GetString(), ref.GetStringLength());
}
} else {
// Plain name fragment, relative to the resolved URI
+ // Not supported in open api 2.0 and 3.0
+ PointerType pointer(allocator_);
+ if (spec_.oapi == kVersion20 || spec_.oapi == kVersion30)
+ SchemaErrorValue(kSchemaErrorRefPlainName, source, s, len);
// See if the fragment matches an id in this document.
// Search from the base we just established. Returns the subschema in the document and its absolute JSON pointer.
- PointerType pointer = PointerType();
- if (const ValueType *pv = FindId(*base, ref, pointer, UriType(ref.GetBaseString(), ref.GetBaseStringLength(), allocator_), true, basePointer)) {
- if (!IsCyclicRef(pointer)) {
- //GenericStringBuffer<EncodingType> sb;
- //pointer.StringifyUriFragment(sb);
+ else if (const ValueType *pv = FindId(*base, ref, pointer, UriType(ref.GetBaseString(), ref.GetBaseStringLength(), allocator_), true, basePointer)) {
+ if (IsCyclicRef(pointer))
+ SchemaErrorValue(kSchemaErrorRefCyclical, source, ref.GetString(), ref.GetStringLength());
+ else {
// Call CreateSchema recursively, but first compute the in-scope id for the $ref target as we have jumped there
// TODO: cache pointer <-> id mapping
size_t unresolvedTokenIndex;
@@ -1861,7 +2304,8 @@ private:
CreateSchema(schema, pointer, *pv, document, scopeId);
return true;
}
- }
+ } else
+ SchemaErrorValue(kSchemaErrorRefUnknown, source, ref.GetString(), ref.GetStringLength());
}
}
}
@@ -1891,6 +2335,7 @@ private:
}
// See if it matches
if (localuri.Match(finduri, full)) {
+ RAPIDJSON_SCHEMA_PRINT(Method, "GenericSchemaDocument::FindId (match)", full ? localuri.GetString() : localuri.GetBaseString());
resval = const_cast<ValueType *>(&doc);
resptr = here;
return resval;
@@ -1917,6 +2362,7 @@ private:
// Added by PR #1393
void AddSchemaRefs(SchemaType* schema) {
+ RAPIDJSON_SCHEMA_PRINT(Method, "GenericSchemaDocument::AddSchemaRefs");
while (!schemaRef_.Empty()) {
SchemaRefPtr *ref = schemaRef_.template Pop<SchemaRefPtr>(1);
SchemaEntry *entry = schemaMap_.template Push<SchemaEntry>();
@@ -1958,8 +2404,11 @@ private:
SchemaType* typeless_;
internal::Stack<Allocator> schemaMap_; // Stores created Pointer -> Schemas
internal::Stack<Allocator> schemaRef_; // Stores Pointer(s) from $ref(s) until resolved
- SValue uri_; // Schema document URI
+ GValue uri_; // Schema document URI
UriType docId_;
+ Specification spec_;
+ GValue error_;
+ GValue currentError_;
};
//! GenericSchemaDocument using Value type.
@@ -2023,11 +2472,10 @@ public:
currentError_(),
missingDependents_(),
valid_(true),
- flags_(kValidateDefaultFlags)
-#if RAPIDJSON_SCHEMA_VERBOSE
- , depth_(0)
-#endif
+ flags_(kValidateDefaultFlags),
+ depth_(0)
{
+ RAPIDJSON_SCHEMA_PRINT(Method, "GenericSchemaValidator::GenericSchemaValidator");
}
//! Constructor with output handler.
@@ -2055,11 +2503,10 @@ public:
currentError_(),
missingDependents_(),
valid_(true),
- flags_(kValidateDefaultFlags)
-#if RAPIDJSON_SCHEMA_VERBOSE
- , depth_(0)
-#endif
+ flags_(kValidateDefaultFlags),
+ depth_(0)
{
+ RAPIDJSON_SCHEMA_PRINT(Method, "GenericSchemaValidator::GenericSchemaValidator (output handler)");
}
//! Destructor.
@@ -2092,13 +2539,12 @@ public:
return flags_;
}
- //! Checks whether the current state is valid.
- // Implementation of ISchemaValidator
virtual bool IsValid() const {
if (!valid_) return false;
if (GetContinueOnErrors() && !error_.ObjectEmpty()) return false;
return true;
}
+ //! End of Implementation of ISchemaValidator
//! Gets the error object.
ValueType& GetError() { return error_; }
@@ -2306,13 +2752,29 @@ public:
void NoneOf(ISchemaValidator** subvalidators, SizeType count) {
AddErrorArray(kValidateErrorAnyOf, subvalidators, count);
}
- void NotOneOf(ISchemaValidator** subvalidators, SizeType count, bool matched = false) {
- AddErrorArray(matched ? kValidateErrorOneOfMatch : kValidateErrorOneOf, subvalidators, count);
+ void NotOneOf(ISchemaValidator** subvalidators, SizeType count) {
+ AddErrorArray(kValidateErrorOneOf, subvalidators, count);
+ }
+ void MultipleOneOf(SizeType index1, SizeType index2) {
+ ValueType matches(kArrayType);
+ matches.PushBack(index1, GetStateAllocator());
+ matches.PushBack(index2, GetStateAllocator());
+ currentError_.SetObject();
+ currentError_.AddMember(GetMatchesString(), matches, GetStateAllocator());
+ AddCurrentError(kValidateErrorOneOfMatch);
}
void Disallowed() {
currentError_.SetObject();
AddCurrentError(kValidateErrorNot);
}
+ void DisallowedWhenWriting() {
+ currentError_.SetObject();
+ AddCurrentError(kValidateErrorReadOnly);
+ }
+ void DisallowedWhenReading() {
+ currentError_.SetObject();
+ AddCurrentError(kValidateErrorWriteOnly);
+ }
#define RAPIDJSON_STRING_(name, ...) \
static const StringRefType& Get##name##String() {\
@@ -2331,25 +2793,18 @@ public:
RAPIDJSON_STRING_(ErrorCode, 'e', 'r', 'r', 'o', 'r', 'C', 'o', 'd', 'e')
RAPIDJSON_STRING_(ErrorMessage, 'e', 'r', 'r', 'o', 'r', 'M', 'e', 's', 's', 'a', 'g', 'e')
RAPIDJSON_STRING_(Duplicates, 'd', 'u', 'p', 'l', 'i', 'c', 'a', 't', 'e', 's')
+ RAPIDJSON_STRING_(Matches, 'm', 'a', 't', 'c', 'h', 'e', 's')
#undef RAPIDJSON_STRING_
-#if RAPIDJSON_SCHEMA_VERBOSE
-#define RAPIDJSON_SCHEMA_HANDLE_BEGIN_VERBOSE_() \
-RAPIDJSON_MULTILINEMACRO_BEGIN\
- *documentStack_.template Push<Ch>() = '\0';\
- documentStack_.template Pop<Ch>(1);\
- internal::PrintInvalidDocument(documentStack_.template Bottom<Ch>());\
-RAPIDJSON_MULTILINEMACRO_END
-#else
-#define RAPIDJSON_SCHEMA_HANDLE_BEGIN_VERBOSE_()
-#endif
-
#define RAPIDJSON_SCHEMA_HANDLE_BEGIN_(method, arg1)\
if (!valid_) return false; \
if ((!BeginValue() && !GetContinueOnErrors()) || (!CurrentSchema().method arg1 && !GetContinueOnErrors())) {\
- RAPIDJSON_SCHEMA_HANDLE_BEGIN_VERBOSE_();\
- return valid_ = false;\
+ *documentStack_.template Push<Ch>() = '\0';\
+ documentStack_.template Pop<Ch>(1);\
+ RAPIDJSON_SCHEMA_PRINT(InvalidDocument, documentStack_.template Bottom<Ch>());\
+ valid_ = false;\
+ return valid_;\
}
#define RAPIDJSON_SCHEMA_HANDLE_PARALLEL_(method, arg2)\
@@ -2386,50 +2841,66 @@ RAPIDJSON_MULTILINEMACRO_END
{ RAPIDJSON_SCHEMA_HANDLE_VALUE_(String, (CurrentContext(), str, length, copy), (str, length, copy)); }
bool StartObject() {
+ RAPIDJSON_SCHEMA_PRINT(Method, "GenericSchemaValidator::StartObject");
RAPIDJSON_SCHEMA_HANDLE_BEGIN_(StartObject, (CurrentContext()));
RAPIDJSON_SCHEMA_HANDLE_PARALLEL_(StartObject, ());
- return valid_ = !outputHandler_ || outputHandler_->StartObject();
+ valid_ = !outputHandler_ || outputHandler_->StartObject();
+ return valid_;
}
bool Key(const Ch* str, SizeType len, bool copy) {
+ RAPIDJSON_SCHEMA_PRINT(Method, "GenericSchemaValidator::Key", str);
if (!valid_) return false;
AppendToken(str, len);
- if (!CurrentSchema().Key(CurrentContext(), str, len, copy) && !GetContinueOnErrors()) return valid_ = false;
+ if (!CurrentSchema().Key(CurrentContext(), str, len, copy) && !GetContinueOnErrors()) {
+ valid_ = false;
+ return valid_;
+ }
RAPIDJSON_SCHEMA_HANDLE_PARALLEL_(Key, (str, len, copy));
- return valid_ = !outputHandler_ || outputHandler_->Key(str, len, copy);
+ valid_ = !outputHandler_ || outputHandler_->Key(str, len, copy);
+ return valid_;
}
bool EndObject(SizeType memberCount) {
+ RAPIDJSON_SCHEMA_PRINT(Method, "GenericSchemaValidator::EndObject");
if (!valid_) return false;
RAPIDJSON_SCHEMA_HANDLE_PARALLEL_(EndObject, (memberCount));
- if (!CurrentSchema().EndObject(CurrentContext(), memberCount) && !GetContinueOnErrors()) return valid_ = false;
+ if (!CurrentSchema().EndObject(CurrentContext(), memberCount) && !GetContinueOnErrors()) {
+ valid_ = false;
+ return valid_;
+ }
RAPIDJSON_SCHEMA_HANDLE_END_(EndObject, (memberCount));
}
bool StartArray() {
+ RAPIDJSON_SCHEMA_PRINT(Method, "GenericSchemaValidator::StartArray");
RAPIDJSON_SCHEMA_HANDLE_BEGIN_(StartArray, (CurrentContext()));
RAPIDJSON_SCHEMA_HANDLE_PARALLEL_(StartArray, ());
- return valid_ = !outputHandler_ || outputHandler_->StartArray();
+ valid_ = !outputHandler_ || outputHandler_->StartArray();
+ return valid_;
}
bool EndArray(SizeType elementCount) {
+ RAPIDJSON_SCHEMA_PRINT(Method, "GenericSchemaValidator::EndArray");
if (!valid_) return false;
RAPIDJSON_SCHEMA_HANDLE_PARALLEL_(EndArray, (elementCount));
- if (!CurrentSchema().EndArray(CurrentContext(), elementCount) && !GetContinueOnErrors()) return valid_ = false;
+ if (!CurrentSchema().EndArray(CurrentContext(), elementCount) && !GetContinueOnErrors()) {
+ valid_ = false;
+ return valid_;
+ }
RAPIDJSON_SCHEMA_HANDLE_END_(EndArray, (elementCount));
}
-#undef RAPIDJSON_SCHEMA_HANDLE_BEGIN_VERBOSE_
#undef RAPIDJSON_SCHEMA_HANDLE_BEGIN_
#undef RAPIDJSON_SCHEMA_HANDLE_PARALLEL_
#undef RAPIDJSON_SCHEMA_HANDLE_VALUE_
// Implementation of ISchemaStateFactory<SchemaType>
virtual ISchemaValidator* CreateSchemaValidator(const SchemaType& root, const bool inheritContinueOnErrors) {
+ *documentStack_.template Push<Ch>() = '\0';
+ documentStack_.template Pop<Ch>(1);
ISchemaValidator* sv = new (GetStateAllocator().Malloc(sizeof(GenericSchemaValidator))) GenericSchemaValidator(*schemaDocument_, root, documentStack_.template Bottom<char>(), documentStack_.GetSize(),
-#if RAPIDJSON_SCHEMA_VERBOSE
depth_ + 1,
-#endif
&GetStateAllocator());
sv->SetValidateFlags(inheritContinueOnErrors ? GetValidateFlags() : GetValidateFlags() & ~(unsigned)kValidateContinueOnErrorFlag);
return sv;
@@ -2462,6 +2933,7 @@ RAPIDJSON_MULTILINEMACRO_END
virtual void FreeState(void* p) {
StateAllocator::Free(p);
}
+ // End of implementation of ISchemaStateFactory<SchemaType>
private:
typedef typename SchemaType::Context Context;
@@ -2472,9 +2944,7 @@ private:
const SchemaDocumentType& schemaDocument,
const SchemaType& root,
const char* basePath, size_t basePathSize,
-#if RAPIDJSON_SCHEMA_VERBOSE
unsigned depth,
-#endif
StateAllocator* allocator = 0,
size_t schemaStackCapacity = kDefaultSchemaStackCapacity,
size_t documentStackCapacity = kDefaultDocumentStackCapacity)
@@ -2490,11 +2960,10 @@ private:
currentError_(),
missingDependents_(),
valid_(true),
- flags_(kValidateDefaultFlags)
-#if RAPIDJSON_SCHEMA_VERBOSE
- , depth_(depth)
-#endif
+ flags_(kValidateDefaultFlags),
+ depth_(depth)
{
+ RAPIDJSON_SCHEMA_PRINT(Method, "GenericSchemaValidator::GenericSchemaValidator (internal)", basePath && basePathSize ? basePath : "");
if (basePath && basePathSize)
memcpy(documentStack_.template Push<char>(basePathSize), basePath, basePathSize);
}
@@ -2510,6 +2979,7 @@ private:
}
bool BeginValue() {
+ RAPIDJSON_SCHEMA_PRINT(Method, "GenericSchemaValidator::BeginValue");
if (schemaStack_.Empty())
PushSchema(root_);
else {
@@ -2531,6 +3001,7 @@ private:
ISchemaValidator**& va = CurrentContext().patternPropertiesValidators;
SizeType& validatorCount = CurrentContext().patternPropertiesValidatorCount;
va = static_cast<ISchemaValidator**>(MallocState(sizeof(ISchemaValidator*) * count));
+ std::memset(va, 0, sizeof(ISchemaValidator*) * count);
for (SizeType i = 0; i < count; i++)
va[validatorCount++] = CreateSchemaValidator(*sa[i], true); // Inherit continueOnError
}
@@ -2541,17 +3012,15 @@ private:
}
bool EndValue() {
+ RAPIDJSON_SCHEMA_PRINT(Method, "GenericSchemaValidator::EndValue");
if (!CurrentSchema().EndValue(CurrentContext()) && !GetContinueOnErrors())
return false;
-#if RAPIDJSON_SCHEMA_VERBOSE
GenericStringBuffer<EncodingType> sb;
- schemaDocument_->GetPointer(&CurrentSchema()).Stringify(sb);
-
+ schemaDocument_->GetPointer(&CurrentSchema()).StringifyUriFragment(sb);
*documentStack_.template Push<Ch>() = '\0';
documentStack_.template Pop<Ch>(1);
- internal::PrintValidatorPointers(depth_, sb.GetString(), documentStack_.template Bottom<Ch>());
-#endif
+ RAPIDJSON_SCHEMA_PRINT(ValidatorPointers, sb.GetString(), documentStack_.template Bottom<Ch>(), depth_);
void* hasher = CurrentContext().hasher;
uint64_t h = hasher && CurrentContext().arrayUniqueness ? static_cast<HasherType*>(hasher)->GetHashCode() : 0;
@@ -2602,7 +3071,7 @@ private:
}
}
- RAPIDJSON_FORCEINLINE void PushSchema(const SchemaType& schema) { new (schemaStack_.template Push<Context>()) Context(*this, *this, &schema); }
+ RAPIDJSON_FORCEINLINE void PushSchema(const SchemaType& schema) { new (schemaStack_.template Push<Context>()) Context(*this, *this, &schema, flags_); }
RAPIDJSON_FORCEINLINE void PopSchema() {
Context* c = schemaStack_.template Pop<Context>(1);
@@ -2704,9 +3173,7 @@ private:
ValueType missingDependents_;
bool valid_;
unsigned flags_;
-#if RAPIDJSON_SCHEMA_VERBOSE
unsigned depth_;
-#endif
};
typedef GenericSchemaValidator<SchemaDocument> SchemaValidator;
diff --git a/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/unittest/cursorstreamwrappertest.cpp b/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/unittest/cursorstreamwrappertest.cpp
index dad3359459a..49e3d5e5490 100644
--- a/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/unittest/cursorstreamwrappertest.cpp
+++ b/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/unittest/cursorstreamwrappertest.cpp
@@ -20,7 +20,7 @@ using namespace rapidjson;
// static const char json[] = "{\"string\"\n\n:\"my string\",\"array\"\n:[\"1\", \"2\", \"3\"]}";
-bool testJson(const char *json, size_t &line, size_t &col) {
+static bool testJson(const char *json, size_t &line, size_t &col) {
StringStream ss(json);
CursorStreamWrapper<StringStream> csw(ss);
Document document;
diff --git a/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/unittest/encodedstreamtest.cpp b/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/unittest/encodedstreamtest.cpp
index 52e5040bb02..72a34411079 100644
--- a/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/unittest/encodedstreamtest.cpp
+++ b/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/unittest/encodedstreamtest.cpp
@@ -113,8 +113,8 @@ protected:
EXPECT_EQ(expected, actual);
}
EXPECT_EQ('\0', s.Peek());
- free(data);
EXPECT_EQ(size, eis.Tell());
+ free(data);
}
}
diff --git a/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/unittest/ostreamwrappertest.cpp b/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/unittest/ostreamwrappertest.cpp
index ec809e2edcb..707d3647d0a 100644
--- a/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/unittest/ostreamwrappertest.cpp
+++ b/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/unittest/ostreamwrappertest.cpp
@@ -77,7 +77,7 @@ static void TestFileStream() {
}
fp = fopen(filename, "r");
- ASSERT_TRUE( fp != NULL );
+ ASSERT_TRUE( fp != NULL );
for (const char* p = s; *p; p++)
EXPECT_EQ(*p, static_cast<char>(fgetc(fp)));
fclose(fp);
diff --git a/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/unittest/pointertest.cpp b/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/unittest/pointertest.cpp
index 4173f15e7e4..471ed7effc1 100644
--- a/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/unittest/pointertest.cpp
+++ b/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/unittest/pointertest.cpp
@@ -303,7 +303,7 @@ TEST(Pointer, Parse_URIFragment) {
}
{
- // Decode UTF-8 perecent encoding to UTF-8
+ // Decode UTF-8 percent encoding to UTF-8
Pointer p("#/%C2%A2");
EXPECT_TRUE(p.IsValid());
EXPECT_EQ(1u, p.GetTokenCount());
@@ -311,7 +311,7 @@ TEST(Pointer, Parse_URIFragment) {
}
{
- // Decode UTF-8 perecent encoding to UTF-16
+ // Decode UTF-8 percent encoding to UTF-16
GenericPointer<GenericValue<UTF16<> > > p(L"#/%C2%A2");
EXPECT_TRUE(p.IsValid());
EXPECT_EQ(1u, p.GetTokenCount());
@@ -320,7 +320,7 @@ TEST(Pointer, Parse_URIFragment) {
}
{
- // Decode UTF-8 perecent encoding to UTF-16
+ // Decode UTF-8 percent encoding to UTF-16
GenericPointer<GenericValue<UTF16<> > > p(L"#/%E2%82%AC");
EXPECT_TRUE(p.IsValid());
EXPECT_EQ(1u, p.GetTokenCount());
diff --git a/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/unittest/schematest.cpp b/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/unittest/schematest.cpp
index 92c1b72384a..3f511b3e171 100644
--- a/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/unittest/schematest.cpp
+++ b/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/unittest/schematest.cpp
@@ -112,6 +112,13 @@ TEST(SchemaValidator, Hasher) {
#define VALIDATE(schema, json, expected) \
{\
+ VALIDATE_(schema, json, expected, true) \
+}
+
+#define VALIDATE_(schema, json, expected, expected2) \
+{\
+ EXPECT_TRUE(expected2 == schema.GetError().ObjectEmpty());\
+ EXPECT_TRUE(schema.IsSupportedSpecification());\
SchemaValidator validator(schema);\
Document d;\
/*printf("\n%s\n", json);*/\
@@ -149,6 +156,8 @@ TEST(SchemaValidator, Hasher) {
#define INVALIDATE_(schema, json, invalidSchemaPointer, invalidSchemaKeyword, invalidDocumentPointer, error, \
flags, SchemaValidatorType, PointerType) \
{\
+ EXPECT_TRUE(schema.GetError().ObjectEmpty());\
+ EXPECT_TRUE(schema.IsSupportedSpecification());\
SchemaValidatorType validator(schema);\
validator.SetValidateFlags(flags);\
Document d;\
@@ -188,6 +197,20 @@ TEST(SchemaValidator, Hasher) {
}\
}
+// Use for checking whether a compiled schema document contains errors
+#define SCHEMAERROR(schema, error) \
+{\
+ Document e;\
+ e.Parse(error);\
+ if (schema.GetError() != e) {\
+ StringBuffer sb;\
+ Writer<StringBuffer> w(sb);\
+ schema.GetError().Accept(w);\
+ printf("GetError() Expected: %s Actual: %s\n", error, sb.GetString());\
+ ADD_FAILURE();\
+ }\
+}
+
TEST(SchemaValidator, Typeless) {
Document sd;
sd.Parse("{}");
@@ -223,7 +246,7 @@ TEST(SchemaValidator, Enum_Typed) {
"{ \"enum\": { \"errorCode\": 19, \"instanceRef\": \"#\", \"schemaRef\": \"#\" }}");
}
-TEST(SchemaValidator, Enum_Typless) {
+TEST(SchemaValidator, Enum_Typeless) {
Document sd;
sd.Parse("{ \"enum\": [\"red\", \"amber\", \"green\", null, 42] }");
SchemaDocument s(sd);
@@ -333,7 +356,7 @@ TEST(SchemaValidator, OneOf) {
" ]"
"}}");
INVALIDATE(s, "15", "", "oneOf", "",
- "{ \"oneOf\": { \"errorCode\": 22, \"instanceRef\": \"#\", \"schemaRef\": \"#\", \"errors\": [{}, {}]}}");
+ "{ \"oneOf\": { \"errorCode\": 22, \"instanceRef\": \"#\", \"schemaRef\": \"#\", \"matches\": [0,1]}}");
}
TEST(SchemaValidator, Not) {
@@ -502,12 +525,13 @@ TEST(SchemaValidator, String_Pattern) {
TEST(SchemaValidator, String_Pattern_Invalid) {
Document sd;
- sd.Parse("{\"type\":\"string\",\"pattern\":\"a{0}\"}"); // TODO: report regex is invalid somehow
+ sd.Parse("{\"type\":\"string\",\"pattern\":\"a{0}\"}");
SchemaDocument s(sd);
+ SCHEMAERROR(s, "{\"RegexInvalid\":{\"errorCode\":9,\"instanceRef\":\"#/pattern\",\"value\":\"a{0}\"}}");
- VALIDATE(s, "\"\"", true);
- VALIDATE(s, "\"a\"", true);
- VALIDATE(s, "\"aa\"", true);
+ VALIDATE_(s, "\"\"", true, false);
+ VALIDATE_(s, "\"a\"", true, false);
+ VALIDATE_(s, "\"aa\"", true, false);
}
#endif
@@ -1886,12 +1910,6 @@ TEST(SchemaValidator, SchemaPointer) {
" },"
" \"f\": {"
" \"type\": \"boolean\""
- " },"
- " \"cyclic_source\": {"
- " \"$ref\": \"#/definitions/Resp_200/properties/cyclic_target\""
- " },"
- " \"cyclic_target\": {"
- " \"$ref\": \"#/definitions/Resp_200/properties/cyclic_source\""
" }"
" },"
" \"type\": \"object\""
@@ -2135,9 +2153,13 @@ public:
}
virtual const SchemaDocumentType* GetRemoteDocument(const char* uri, SizeType length) {
+ //printf("GetRemoteDocument : %s\n", uri);
for (size_t i = 0; i < kCount; i++)
- if (typename SchemaDocumentType::SValue(uri, length) == sd_[i]->GetURI())
+ if (typename SchemaDocumentType::GValue(uri, length) == sd_[i]->GetURI()) {
+ //printf("Matched document");
return sd_[i];
+ }
+ //printf("No matched document");
return 0;
}
@@ -2390,7 +2412,9 @@ TEST(SchemaValidator, Issue728_AllOfRef) {
Document sd;
sd.Parse("{\"allOf\": [{\"$ref\": \"#/abc\"}]}");
SchemaDocument s(sd);
- VALIDATE(s, "{\"key1\": \"abc\", \"key2\": \"def\"}", true);
+ SCHEMAERROR(s, "{\"RefUnknown\":{\"errorCode\":5,\"instanceRef\":\"#/allOf/0\",\"value\":\"#/abc\"}}");
+
+ VALIDATE_(s, "{\"key1\": \"abc\", \"key2\": \"def\"}", true, false);
}
TEST(SchemaValidator, Issue1017_allOfHandler) {
@@ -2625,7 +2649,7 @@ TEST(SchemaValidator, Ref_remote_issue1210) {
SchemaDocumentProvider(SchemaDocument** collection) : collection(collection) { }
virtual const SchemaDocument* GetRemoteDocument(const char* uri, SizeType length) {
int i = 0;
- while (collection[i] && SchemaDocument::SValue(uri, length) != collection[i]->GetURI()) ++i;
+ while (collection[i] && SchemaDocument::GValue(uri, length) != collection[i]->GetURI()) ++i;
return collection[i];
}
};
@@ -2656,7 +2680,7 @@ TEST(SchemaValidator, ContinueOnErrors) {
ASSERT_FALSE(sd.HasParseError());
SchemaDocument s(sd);
VALIDATE(s, "{\"version\": 1.0, \"address\": {\"number\": 24, \"street1\": \"The Woodlands\", \"street3\": \"Ham\", \"city\": \"Romsey\", \"area\": \"Kent\", \"country\": \"UK\", \"postcode\": \"SO51 0GP\"}, \"phones\": [\"0111-222333\", \"0777-666888\"], \"names\": [\"Fred\", \"Bloggs\"]}", true);
- INVALIDATE_(s, "{\"version\": 1.01, \"address\": {\"number\": 0, \"street2\": false, \"street3\": \"Ham\", \"city\": \"RomseyTownFC\", \"area\": \"BC\", \"country\": \"USA\", \"postcode\": \"999ABC\"}, \"phones\": [], \"planet\": \"Earth\", \"extra\": {\"S_xxx\": 123}}", "#", "errors", "#",
+ INVALIDATE_(s, "{\"version\": 1.01, \"address\": {\"number\": 0, \"street2\": false, \"street3\": \"Ham\", \"city\": \"RomseyTownFC\", \"area\": \"Narnia\", \"country\": \"USA\", \"postcode\": \"999ABC\"}, \"phones\": [], \"planet\": \"Earth\", \"extra\": {\"S_xxx\": 123}}", "#", "errors", "#",
"{ \"multipleOf\": {"
" \"errorCode\": 1, \"instanceRef\": \"#/version\", \"schemaRef\": \"#/definitions/decimal_type\", \"expected\": 1.0, \"actual\": 1.01"
" },"
@@ -2691,6 +2715,9 @@ TEST(SchemaValidator, ContinueOnErrors) {
" },"
" \"required\": {"
" \"missing\": [\"street1\"], \"errorCode\": 15, \"instanceRef\": \"#/address\", \"schemaRef\": \"#/definitions/address_type\""
+ " },"
+ " \"oneOf\": {"
+ " \"matches\": [0, 1], \"errorCode\": 22, \"instanceRef\": \"#/address/area\", \"schemaRef\": \"#/definitions/address_type/properties/area\""
" }"
"}",
kValidateDefaultFlags | kValidateContinueOnErrorFlag, SchemaValidator, Pointer);
@@ -2917,7 +2944,7 @@ TEST(SchemaValidator, ContinueOnErrors_RogueString) {
// Test that when kValidateContinueOnErrorFlag is set, an incorrect simple type with a sub-schema is handled correctly.
// This tests that we don't blow up when there is a type mismatch but there is a sub-schema present
-TEST(SchemaValidator, ContinueOnErrors_Issue2) {
+TEST(SchemaValidator, ContinueOnErrors_BadSimpleType) {
Document sd;
sd.Parse("{\"type\":\"string\", \"anyOf\":[{\"maxLength\":2}]}");
ASSERT_FALSE(sd.HasParseError());
@@ -2943,10 +2970,606 @@ TEST(SchemaValidator, ContinueOnErrors_Issue2) {
kValidateDefaultFlags | kValidateContinueOnErrorFlag, SchemaValidator, Pointer);
}
-TEST(SchemaValidator, Schema_UnknownError) {
+
+TEST(SchemaValidator, UnknownValidationError) {
ASSERT_TRUE(SchemaValidator::SchemaType::GetValidateErrorKeyword(kValidateErrors).GetString() == std::string("null"));
}
+// The first occurrence of a duplicate keyword is taken
+TEST(SchemaValidator, DuplicateKeyword) {
+ Document sd;
+ sd.Parse("{ \"title\": \"test\",\"type\": \"number\", \"type\": \"string\" }");
+ EXPECT_FALSE(sd.HasParseError());
+ SchemaDocument s(sd);
+ VALIDATE(s, "42", true);
+ INVALIDATE(s, "\"Life, the universe, and everything\"", "", "type", "",
+ "{ \"type\": {"
+ " \"errorCode\": 20,"
+ " \"instanceRef\": \"#\", \"schemaRef\": \"#\","
+ " \"expected\": [\"number\"], \"actual\": \"string\""
+ "}}");
+}
+
+
+// SchemaDocument tests
+
+// Specification (schema draft, open api version)
+TEST(SchemaValidator, Schema_SupportedNotObject) {
+ Document sd;
+ sd.Parse("true");
+ ASSERT_FALSE(sd.HasParseError());
+ SchemaDocument s(sd);
+ ASSERT_TRUE(s.IsSupportedSpecification());
+ ASSERT_TRUE(s.GetSpecification().draft == kDraft04);
+ ASSERT_TRUE(s.GetSpecification().oapi == kVersionNone);
+ EXPECT_TRUE(s.GetError().ObjectEmpty());
+}
+
+TEST(SchemaValidator, Schema_SupportedNoSpec) {
+ Document sd;
+ sd.Parse("{\"type\": \"integer\"}");
+ ASSERT_FALSE(sd.HasParseError());
+ SchemaDocument s(sd);
+ ASSERT_TRUE(s.IsSupportedSpecification());
+ ASSERT_TRUE(s.GetSpecification().draft == kDraft04);
+ ASSERT_TRUE(s.GetSpecification().oapi == kVersionNone);
+ EXPECT_TRUE(s.GetError().ObjectEmpty());
+}
+
+TEST(SchemaValidator, Schema_SupportedNoSpecStatic) {
+ typedef GenericSchemaDocument<Value, MemoryPoolAllocator<> > SchemaDocumentType;
+ Document sd;
+ sd.Parse("{\"type\": \"integer\"}");
+ ASSERT_FALSE(sd.HasParseError());
+ Specification spec = SchemaDocumentType::GetSpecification(sd);
+ ASSERT_FALSE(spec.IsSupported());
+ ASSERT_TRUE(spec.draft == kDraftNone);
+ ASSERT_TRUE(spec.oapi == kVersionNone);
+}
+
+TEST(SchemaValidator, Schema_SupportedDraft5Static) {
+ typedef GenericSchemaDocument<Value, MemoryPoolAllocator<> > SchemaDocumentType;
+ Document sd;
+ sd.Parse("{\"$schema\":\"http://json-schema.org/draft-05/schema#\", \"type\": \"integer\"}");
+ ASSERT_FALSE(sd.HasParseError());
+ Specification spec = SchemaDocumentType::GetSpecification(sd);
+ ASSERT_TRUE(spec.IsSupported());
+ ASSERT_TRUE(spec.draft == kDraft05);
+ ASSERT_TRUE(spec.oapi == kVersionNone);
+}
+
+TEST(SchemaValidator, Schema_SupportedDraft4) {
+ Document sd;
+ sd.Parse("{\"$schema\":\"http://json-schema.org/draft-04/schema#\", \"type\": \"integer\"}");
+ ASSERT_FALSE(sd.HasParseError());
+ SchemaDocument s(sd);
+ ASSERT_TRUE(s.IsSupportedSpecification());
+ ASSERT_TRUE(s.GetSpecification().draft == kDraft04);
+ ASSERT_TRUE(s.GetSpecification().oapi == kVersionNone);
+ EXPECT_TRUE(s.GetError().ObjectEmpty());
+}
+
+TEST(SchemaValidator, Schema_SupportedDraft4NoFrag) {
+ Document sd;
+ sd.Parse("{\"$schema\":\"http://json-schema.org/draft-04/schema\", \"type\": \"integer\"}");
+ ASSERT_FALSE(sd.HasParseError());
+ SchemaDocument s(sd);
+ ASSERT_TRUE(s.IsSupportedSpecification());
+ ASSERT_TRUE(s.GetSpecification().draft == kDraft04);
+ ASSERT_TRUE(s.GetSpecification().oapi == kVersionNone);
+ EXPECT_TRUE(s.GetError().ObjectEmpty());
+}
+
+TEST(SchemaValidator, Schema_SupportedDraft5) {
+ Document sd;
+ sd.Parse("{\"$schema\":\"http://json-schema.org/draft-05/schema#\", \"type\": \"integer\"}");
+ ASSERT_FALSE(sd.HasParseError());
+ SchemaDocument s(sd);
+ ASSERT_TRUE(s.IsSupportedSpecification());
+ ASSERT_TRUE(s.GetSpecification().draft == kDraft05);
+ ASSERT_TRUE(s.GetSpecification().oapi == kVersionNone);
+ EXPECT_TRUE(s.GetError().ObjectEmpty());
+}
+
+TEST(SchemaValidator, Schema_SupportedDraft5NoFrag) {
+ Document sd;
+ sd.Parse("{\"$schema\":\"http://json-schema.org/draft-05/schema\", \"type\": \"integer\"}");
+ ASSERT_FALSE(sd.HasParseError());
+ SchemaDocument s(sd);
+ ASSERT_TRUE(s.IsSupportedSpecification());
+ ASSERT_TRUE(s.GetSpecification().draft == kDraft05);
+ ASSERT_TRUE(s.GetSpecification().oapi == kVersionNone);
+ EXPECT_TRUE(s.GetError().ObjectEmpty());
+}
+
+TEST(SchemaValidator, Schema_IgnoreDraftEmbedded) {
+ Document sd;
+ sd.Parse("{\"root\": {\"$schema\":\"http://json-schema.org/draft-05/schema#\", \"type\": \"integer\"}}");
+ ASSERT_FALSE(sd.HasParseError());
+ SchemaDocument s(sd, 0, 0, 0, 0, SchemaDocument::PointerType("/root"));
+ ASSERT_TRUE(s.IsSupportedSpecification());
+ ASSERT_TRUE(s.GetSpecification().draft == kDraft04);
+ ASSERT_TRUE(s.GetSpecification().oapi == kVersionNone);
+ EXPECT_TRUE(s.GetError().ObjectEmpty());
+}
+
+TEST(SchemaValidator, Schema_SupportedDraftOverride) {
+ Document sd;
+ sd.Parse("{\"type\": \"integer\"}");
+ ASSERT_FALSE(sd.HasParseError());
+ SchemaDocument s(sd, 0, 0, 0, 0, 0, Specification(kDraft04));
+ ASSERT_TRUE(s.IsSupportedSpecification());
+ ASSERT_TRUE(s.GetSpecification().draft == kDraft04);
+ ASSERT_TRUE(s.GetSpecification().oapi == kVersionNone);
+ EXPECT_TRUE(s.GetError().ObjectEmpty());
+}
+
+TEST(SchemaValidator, Schema_UnknownDraftOverride) {
+ Document sd;
+ sd.Parse("{\"type\": \"integer\"}");
+ ASSERT_FALSE(sd.HasParseError());
+ SchemaDocument s(sd, 0, 0, 0, 0, 0, Specification(kDraftUnknown));
+ ASSERT_FALSE(s.IsSupportedSpecification());
+ ASSERT_TRUE(s.GetSpecification().draft == kDraftUnknown);
+ ASSERT_TRUE(s.GetSpecification().oapi == kVersionNone);
+ SCHEMAERROR(s, "{\"SpecUnknown\":{\"errorCode\":10,\"instanceRef\":\"#\"}}");
+}
+
+TEST(SchemaValidator, Schema_UnsupportedDraftOverride) {
+ Document sd;
+ sd.Parse("{\"type\": \"integer\"}");
+ ASSERT_FALSE(sd.HasParseError());
+ SchemaDocument s(sd, 0, 0, 0, 0, 0, Specification(kDraft03));
+ ASSERT_FALSE(s.IsSupportedSpecification());
+ ASSERT_TRUE(s.GetSpecification().draft == kDraft03);
+ ASSERT_TRUE(s.GetSpecification().oapi == kVersionNone);
+ SCHEMAERROR(s, "{\"SpecUnsupported\":{\"errorCode\":11,\"instanceRef\":\"#\"}}");
+}
+
+TEST(SchemaValidator, Schema_UnknownDraft) {
+ Document sd;
+ sd.Parse("{\"$schema\":\"http://json-schema.org/draft-xxx/schema#\", \"type\": \"integer\"}");
+ ASSERT_FALSE(sd.HasParseError());
+ SchemaDocument s(sd);
+ ASSERT_FALSE(s.IsSupportedSpecification());
+ ASSERT_TRUE(s.GetSpecification().draft == kDraftUnknown);
+ ASSERT_TRUE(s.GetSpecification().oapi == kVersionNone);
+ SCHEMAERROR(s, "{\"SpecUnknown\":{\"errorCode\":10,\"instanceRef\":\"#\"}}");
+}
+
+TEST(SchemaValidator, Schema_UnknownDraftNotString) {
+ Document sd;
+ sd.Parse("{\"$schema\": 4, \"type\": \"integer\"}");
+ ASSERT_FALSE(sd.HasParseError());
+ SchemaDocument s(sd);
+ ASSERT_FALSE(s.IsSupportedSpecification());
+ ASSERT_TRUE(s.GetSpecification().draft == kDraftUnknown);
+ ASSERT_TRUE(s.GetSpecification().oapi == kVersionNone);
+ SCHEMAERROR(s, "{\"SpecUnknown\":{\"errorCode\":10,\"instanceRef\":\"#\"}}");
+}
+
+TEST(SchemaValidator, Schema_UnsupportedDraft3) {
+ Document sd;
+ sd.Parse("{\"$schema\":\"http://json-schema.org/draft-03/schema#\", \"type\": \"integer\"}");
+ ASSERT_FALSE(sd.HasParseError());
+ SchemaDocument s(sd);
+ ASSERT_FALSE(s.IsSupportedSpecification());
+ ASSERT_TRUE(s.GetSpecification().draft == kDraft03);
+ ASSERT_TRUE(s.GetSpecification().oapi == kVersionNone);
+ SCHEMAERROR(s, "{\"SpecUnsupported\":{\"errorCode\":11,\"instanceRef\":\"#\"}}");
+}
+
+TEST(SchemaValidator, Schema_UnsupportedDraft6) {
+ Document sd;
+ sd.Parse("{\"$schema\":\"http://json-schema.org/draft-06/schema#\", \"type\": \"integer\"}");
+ ASSERT_FALSE(sd.HasParseError());
+ SchemaDocument s(sd);
+ ASSERT_FALSE(s.IsSupportedSpecification());
+ ASSERT_TRUE(s.GetSpecification().draft == kDraft06);
+ SCHEMAERROR(s, "{\"SpecUnsupported\":{\"errorCode\":11,\"instanceRef\":\"#\"}}");
+}
+
+TEST(SchemaValidator, Schema_UnsupportedDraft7) {
+ Document sd;
+ sd.Parse("{\"$schema\":\"http://json-schema.org/draft-07/schema#\", \"type\": \"integer\"}");
+ ASSERT_FALSE(sd.HasParseError());
+ SchemaDocument s(sd);
+ ASSERT_FALSE(s.IsSupportedSpecification());
+ ASSERT_TRUE(s.GetSpecification().draft == kDraft07);
+ ASSERT_TRUE(s.GetSpecification().oapi == kVersionNone);
+ SCHEMAERROR(s, "{\"SpecUnsupported\":{\"errorCode\":11,\"instanceRef\":\"#\"}}");
+}
+
+TEST(SchemaValidator, Schema_UnsupportedDraft2019_09) {
+ Document sd;
+ sd.Parse("{\"$schema\":\"https://json-schema.org/draft/2019-09/schema\", \"type\": \"integer\"}");
+ ASSERT_FALSE(sd.HasParseError());
+ SchemaDocument s(sd);
+ ASSERT_FALSE(s.IsSupportedSpecification());
+ ASSERT_TRUE(s.GetSpecification().draft == kDraft2019_09);
+ ASSERT_TRUE(s.GetSpecification().oapi == kVersionNone);
+ SCHEMAERROR(s, "{\"SpecUnsupported\":{\"errorCode\":11,\"instanceRef\":\"#\"}}");
+}
+
+TEST(SchemaValidator, Schema_UnsupportedDraft2020_12) {
+ Document sd;
+ sd.Parse("{\"$schema\":\"https://json-schema.org/draft/2020-12/schema\", \"type\": \"integer\"}");
+ ASSERT_FALSE(sd.HasParseError());
+ SchemaDocument s(sd);
+ ASSERT_FALSE(s.IsSupportedSpecification());
+ ASSERT_TRUE(s.GetSpecification().draft == kDraft2020_12);
+ ASSERT_TRUE(s.GetSpecification().oapi == kVersionNone);
+ SCHEMAERROR(s, "{\"SpecUnsupported\":{\"errorCode\":11,\"instanceRef\":\"#\"}}");
+}
+
+TEST(SchemaValidator, Schema_SupportedVersion20Static) {
+ typedef GenericSchemaDocument<Value, MemoryPoolAllocator<> > SchemaDocumentType;
+ Document sd;
+ sd.Parse("{\"swagger\":\"2.0\"}");
+ ASSERT_FALSE(sd.HasParseError());
+ Specification spec = SchemaDocumentType::GetSpecification(sd);
+ ASSERT_TRUE(spec.IsSupported());
+ ASSERT_TRUE(spec.draft == kDraft04);
+ ASSERT_TRUE(spec.oapi == kVersion20);
+}
+
+TEST(SchemaValidator, Schema_SupportedVersion20) {
+ Document sd;
+ sd.Parse("{\"swagger\":\"2.0\"}");
+ ASSERT_FALSE(sd.HasParseError());
+ SchemaDocument s(sd);
+ ASSERT_TRUE(s.IsSupportedSpecification());
+ ASSERT_TRUE(s.GetSpecification().oapi == kVersion20);
+ ASSERT_TRUE(s.GetSpecification().draft == kDraft04);
+ EXPECT_TRUE(s.GetError().ObjectEmpty());
+}
+
+TEST(SchemaValidator, Schema_SupportedVersion30x) {
+ Document sd;
+ sd.Parse("{\"openapi\":\"3.0.0\"}");
+ ASSERT_FALSE(sd.HasParseError());
+ SchemaDocument s(sd);
+ ASSERT_TRUE(s.IsSupportedSpecification());
+ ASSERT_TRUE(s.GetSpecification().oapi == kVersion30);
+ ASSERT_TRUE(s.GetSpecification().draft == kDraft05);
+ EXPECT_TRUE(s.GetError().ObjectEmpty());
+}
+
+TEST(SchemaValidator, Schema_SupportedVersionOverride) {
+ Document sd;
+ sd.Parse("{\"type\": \"integer\"}");
+ ASSERT_FALSE(sd.HasParseError());
+ SchemaDocument s(sd, 0, 0, 0, 0, 0, Specification(kVersion20));
+ ASSERT_TRUE(s.IsSupportedSpecification());
+ ASSERT_TRUE(s.GetSpecification().oapi == kVersion20);
+ ASSERT_TRUE(s.GetSpecification().draft == kDraft04);
+ EXPECT_TRUE(s.GetError().ObjectEmpty());
+}
+
+TEST(SchemaValidator, Schema_UnknownVersionOverride) {
+ Document sd;
+ sd.Parse("{\"type\": \"integer\"}");
+ ASSERT_FALSE(sd.HasParseError());
+ SchemaDocument s(sd, 0, 0, 0, 0, 0, Specification(kVersionUnknown));
+ ASSERT_FALSE(s.IsSupportedSpecification());
+ ASSERT_TRUE(s.GetSpecification().oapi == kVersionUnknown);
+ ASSERT_TRUE(s.GetSpecification().draft == kDraft04);
+ SCHEMAERROR(s, "{\"SpecUnknown\":{\"errorCode\":10,\"instanceRef\":\"#\"}}");
+}
+
+TEST(SchemaValidator, Schema_UnsupportedVersionOverride) {
+ Document sd;
+ sd.Parse("{\"type\": \"integer\"}");
+ ASSERT_FALSE(sd.HasParseError());
+ SchemaDocument s(sd, 0, 0, 0, 0, 0, Specification(kVersion31));
+ ASSERT_FALSE(s.IsSupportedSpecification());
+ ASSERT_TRUE(s.GetSpecification().oapi == kVersion31);
+ ASSERT_TRUE(s.GetSpecification().draft == kDraft2020_12);
+ SCHEMAERROR(s, "{\"SpecUnsupported\":{\"errorCode\":11,\"instanceRef\":\"#\"}}");
+}
+
+TEST(SchemaValidator, Schema_UnknownVersion) {
+ Document sd;
+ sd.Parse("{\"openapi\":\"1.0\"}");
+ ASSERT_FALSE(sd.HasParseError());
+ SchemaDocument s(sd);
+ ASSERT_FALSE(s.IsSupportedSpecification());
+ ASSERT_TRUE(s.GetSpecification().oapi == kVersionUnknown);
+ ASSERT_TRUE(s.GetSpecification().draft == kDraft04);
+ SCHEMAERROR(s, "{\"SpecUnknown\":{\"errorCode\":10,\"instanceRef\":\"#\"}}");
+}
+
+TEST(SchemaValidator, Schema_UnknownVersionShort) {
+ Document sd;
+ sd.Parse("{\"openapi\":\"3.0.\"}");
+ ASSERT_FALSE(sd.HasParseError());
+ SchemaDocument s(sd);
+ ASSERT_FALSE(s.IsSupportedSpecification());
+ ASSERT_TRUE(s.GetSpecification().oapi == kVersionUnknown);
+ ASSERT_TRUE(s.GetSpecification().draft == kDraft04);
+ SCHEMAERROR(s, "{\"SpecUnknown\":{\"errorCode\":10,\"instanceRef\":\"#\"}}");
+}
+
+TEST(SchemaValidator, Schema_UnknownVersionNotString) {
+ Document sd;
+ sd.Parse("{\"swagger\": 2}");
+ ASSERT_FALSE(sd.HasParseError());
+ SchemaDocument s(sd);
+ ASSERT_FALSE(s.IsSupportedSpecification());
+ ASSERT_TRUE(s.GetSpecification().oapi == kVersionUnknown);
+ ASSERT_TRUE(s.GetSpecification().draft == kDraft04);
+ SCHEMAERROR(s, "{\"SpecUnknown\":{\"errorCode\":10,\"instanceRef\":\"#\"}}");
+}
+
+TEST(SchemaValidator, Schema_UnsupportedVersion31) {
+ Document sd;
+ sd.Parse("{\"openapi\":\"3.1.0\"}");
+ ASSERT_FALSE(sd.HasParseError());
+ SchemaDocument s(sd);
+ ASSERT_FALSE(s.IsSupportedSpecification());
+ ASSERT_TRUE(s.GetSpecification().oapi == kVersion31);
+ ASSERT_TRUE(s.GetSpecification().draft == kDraft2020_12);
+ SCHEMAERROR(s, "{\"SpecUnsupported\":{\"errorCode\":11,\"instanceRef\":\"#\"}}");
+}
+
+TEST(SchemaValidator, Schema_DraftAndVersion) {
+ Document sd;
+ sd.Parse("{\"swagger\": \"2.0\", \"$schema\": \"http://json-schema.org/draft-04/schema#\"}");
+ ASSERT_FALSE(sd.HasParseError());
+ SchemaDocument s(sd);
+ ASSERT_TRUE(s.IsSupportedSpecification());
+ SCHEMAERROR(s, "{\"SpecIllegal\":{\"errorCode\":12,\"instanceRef\":\"#\"}}");
+}
+
+TEST(SchemaValidator, Schema_StartUnknown) {
+ Document sd;
+ sd.Parse("{\"type\": \"integer\"}");
+ ASSERT_FALSE(sd.HasParseError());
+ SchemaDocument s(sd, 0, 0, 0, 0, SchemaDocument::PointerType("/nowhere"));
+ SCHEMAERROR(s, "{\"StartUnknown\":{\"errorCode\":1,\"instanceRef\":\"#\", \"value\":\"#/nowhere\"}}");
+}
+
+TEST(SchemaValidator, Schema_MultipleErrors) {
+ Document sd;
+ sd.Parse("{\"swagger\": \"foo\", \"$schema\": \"bar\"}");
+ ASSERT_FALSE(sd.HasParseError());
+ SchemaDocument s(sd);
+ SCHEMAERROR(s, "{ \"SpecUnknown\": {\"errorCode\":10,\"instanceRef\":\"#\"},"
+ " \"SpecIllegal\": {\"errorCode\":12,\"instanceRef\":\"#\"}"
+ "}");
+}
+
+// $ref is a non-JSON pointer fragment - not allowed when OpenAPI
+TEST(SchemaValidator, Schema_RefPlainNameOpenApi) {
+ typedef GenericSchemaDocument<Value, MemoryPoolAllocator<> > SchemaDocumentType;
+ Document sd;
+ sd.Parse("{\"swagger\": \"2.0\", \"type\": \"object\", \"properties\": {\"myInt1\": {\"$ref\": \"#myId\"}, \"myStr\": {\"type\": \"string\", \"id\": \"#myStrId\"}, \"myInt2\": {\"type\": \"integer\", \"id\": \"#myId\"}}}");
+ SchemaDocumentType s(sd);
+ SCHEMAERROR(s, "{\"RefPlainName\":{\"errorCode\":2,\"instanceRef\":\"#/properties/myInt1\",\"value\":\"#myId\"}}");
+}
+
+// $ref is a non-JSON pointer fragment - not allowed when remote document
+TEST(SchemaValidator, Schema_RefPlainNameRemote) {
+ typedef GenericSchemaDocument<Value, MemoryPoolAllocator<> > SchemaDocumentType;
+ RemoteSchemaDocumentProvider<SchemaDocumentType> provider;
+ Document sd;
+ sd.Parse("{\"type\": \"object\", \"properties\": {\"myInt\": {\"$ref\": \"/subSchemas.json#plainname\"}}}");
+ SchemaDocumentType s(sd, "http://localhost:1234/xxxx", 26, &provider);
+ SCHEMAERROR(s, "{\"RefPlainName\":{\"errorCode\":2,\"instanceRef\":\"#/properties/myInt\",\"value\":\"#plainname\"}}");
+}
+
+// $ref is an empty string
+TEST(SchemaValidator, Schema_RefEmptyString) {
+ typedef GenericSchemaDocument<Value, MemoryPoolAllocator<> > SchemaDocumentType;
+ Document sd;
+ sd.Parse("{\"type\": \"object\", \"properties\": {\"myInt1\": {\"$ref\": \"\"}}}");
+ SchemaDocumentType s(sd);
+ SCHEMAERROR(s, "{\"RefInvalid\":{\"errorCode\":3,\"instanceRef\":\"#/properties/myInt1\"}}");
+}
+
+// $ref is remote but no provider
+TEST(SchemaValidator, Schema_RefNoRemoteProvider) {
+ typedef GenericSchemaDocument<Value, MemoryPoolAllocator<> > SchemaDocumentType;
+ Document sd;
+ sd.Parse("{\"type\": \"object\", \"properties\": {\"myInt\": {\"$ref\": \"/subSchemas.json#plainname\"}}}");
+ SchemaDocumentType s(sd, "http://localhost:1234/xxxx", 26, 0);
+ SCHEMAERROR(s, "{\"RefNoRemoteProvider\":{\"errorCode\":7,\"instanceRef\":\"#/properties/myInt\"}}");
+}
+
+// $ref is remote but no schema returned
+TEST(SchemaValidator, Schema_RefNoRemoteSchema) {
+ typedef GenericSchemaDocument<Value, MemoryPoolAllocator<> > SchemaDocumentType;
+ RemoteSchemaDocumentProvider<SchemaDocumentType> provider;
+ Document sd;
+ sd.Parse("{\"type\": \"object\", \"properties\": {\"myInt\": {\"$ref\": \"/will-not-resolve.json\"}}}");
+ SchemaDocumentType s(sd, "http://localhost:1234/xxxx", 26, &provider);
+ SCHEMAERROR(s, "{\"RefNoRemoteSchema\":{\"errorCode\":8,\"instanceRef\":\"#/properties/myInt\",\"value\":\"http://localhost:1234/will-not-resolve.json\"}}");
+}
+
+// $ref pointer is invalid
+TEST(SchemaValidator, Schema_RefPointerInvalid) {
+ typedef GenericSchemaDocument<Value, MemoryPoolAllocator<> > SchemaDocumentType;
+ Document sd;
+ sd.Parse("{\"type\": \"object\", \"properties\": {\"myInt\": {\"$ref\": \"#/&&&&&\"}}}");
+ SchemaDocumentType s(sd);
+ SCHEMAERROR(s, "{\"RefPointerInvalid\":{\"errorCode\":4,\"instanceRef\":\"#/properties/myInt\",\"value\":\"#/&&&&&\",\"offset\":2}}");
+}
+
+// $ref is remote and pointer is invalid
+TEST(SchemaValidator, Schema_RefPointerInvalidRemote) {
+ typedef GenericSchemaDocument<Value, MemoryPoolAllocator<> > SchemaDocumentType;
+ RemoteSchemaDocumentProvider<SchemaDocumentType> provider;
+ Document sd;
+ sd.Parse("{\"type\": \"object\", \"properties\": {\"myInt\": {\"$ref\": \"/subSchemas.json#/abc&&&&&\"}}}");
+ SchemaDocumentType s(sd, "http://localhost:1234/xxxx", 26, &provider);
+ SCHEMAERROR(s, "{\"RefPointerInvalid\":{\"errorCode\":4,\"instanceRef\":\"#/properties/myInt\",\"value\":\"#/abc&&&&&\",\"offset\":5}}");
+}
+
+// $ref is unknown non-pointer
+TEST(SchemaValidator, Schema_RefUnknownPlainName) {
+ typedef GenericSchemaDocument<Value, MemoryPoolAllocator<> > SchemaDocumentType;
+ Document sd;
+ sd.Parse("{\"type\": \"object\", \"properties\": {\"myInt\": {\"$ref\": \"#plainname\"}}}");
+ SchemaDocumentType s(sd);
+ SCHEMAERROR(s, "{\"RefUnknown\":{\"errorCode\":5,\"instanceRef\":\"#/properties/myInt\",\"value\":\"#plainname\"}}");
+}
+
+/// $ref is unknown pointer
+TEST(SchemaValidator, Schema_RefUnknownPointer) {
+ typedef GenericSchemaDocument<Value, MemoryPoolAllocator<> > SchemaDocumentType;
+ Document sd;
+ sd.Parse("{\"type\": \"object\", \"properties\": {\"myInt\": {\"$ref\": \"#/a/b\"}}}");
+ SchemaDocumentType s(sd);
+ SCHEMAERROR(s, "{\"RefUnknown\":{\"errorCode\":5,\"instanceRef\":\"#/properties/myInt\",\"value\":\"#/a/b\"}}");
+}
+
+// $ref is remote and unknown pointer
+TEST(SchemaValidator, Schema_RefUnknownPointerRemote) {
+ typedef GenericSchemaDocument<Value, MemoryPoolAllocator<> > SchemaDocumentType;
+ RemoteSchemaDocumentProvider<SchemaDocumentType> provider;
+ Document sd;
+ sd.Parse("{\"type\": \"object\", \"properties\": {\"myInt\": {\"$ref\": \"/subSchemas.json#/a/b\"}}}");
+ SchemaDocumentType s(sd, "http://localhost:1234/xxxx", 26, &provider);
+ SCHEMAERROR(s, "{\"RefUnknown\":{\"errorCode\":5,\"instanceRef\":\"#/properties/myInt\",\"value\":\"http://localhost:1234/subSchemas.json#/a/b\"}}");
+}
+
+// $ref is cyclical
+TEST(SchemaValidator, Schema_RefCyclical) {
+ typedef GenericSchemaDocument<Value, MemoryPoolAllocator<> > SchemaDocumentType;
+ Document sd;
+ sd.Parse("{\"type\": \"object\", \"properties\": {"
+ " \"cyclic_source\": {"
+ " \"$ref\": \"#/properties/cyclic_target\""
+ " },"
+ " \"cyclic_target\": {"
+ " \"$ref\": \"#/properties/cyclic_source\""
+ " }"
+ "}}");
+ SchemaDocumentType s(sd);
+ SCHEMAERROR(s, "{\"RefCyclical\":{\"errorCode\":6,\"instanceRef\":\"#/properties/cyclic_target\",\"value\":\"#/properties/cyclic_source\"}}");
+}
+
+TEST(SchemaValidator, Schema_ReadOnlyAndWriteOnly) {
+ Document sd;
+ sd.Parse("{\"type\": \"integer\", \"readOnly\": true, \"writeOnly\": true}");
+ ASSERT_FALSE(sd.HasParseError());
+ SchemaDocument s1(sd, 0, 0, 0, 0, 0, Specification(kDraft04));
+ EXPECT_TRUE(s1.GetError().ObjectEmpty());
+ SchemaDocument s2(sd, 0, 0, 0, 0, 0, Specification(kVersion30));
+ SCHEMAERROR(s2, "{\"ReadOnlyAndWriteOnly\":{\"errorCode\":13,\"instanceRef\":\"#\"}}");
+}
+
+TEST(SchemaValidator, ReadOnlyWhenWriting) {
+ Document sd;
+ sd.Parse(
+ "{"
+ " \"type\":\"object\","
+ " \"properties\": {"
+ " \"rprop\" : {"
+ " \"type\": \"string\","
+ " \"readOnly\": true"
+ " }"
+ " }"
+ "}");
+ SchemaDocument s(sd, 0, 0, 0, 0, 0, Specification(kVersion20));
+ VALIDATE(s, "{ \"rprop\": \"hello\" }", true);
+ INVALIDATE_(s, "{ \"rprop\": \"hello\" }", "/properties/rprop", "readOnly", "/rprop",
+ "{ \"readOnly\": {"
+ " \"errorCode\": 26, \"instanceRef\": \"#/rprop\", \"schemaRef\": \"#/properties/rprop\""
+ " }"
+ "}",
+ kValidateDefaultFlags | kValidateWriteFlag, SchemaValidator, Pointer);
+}
+
+TEST(SchemaValidator, WriteOnlyWhenReading) {
+ Document sd;
+ sd.Parse(
+ "{"
+ " \"type\":\"object\","
+ " \"properties\": {"
+ " \"wprop\" : {"
+ " \"type\": \"boolean\","
+ " \"writeOnly\": true"
+ " }"
+ " }"
+ "}");
+ SchemaDocument s(sd, 0, 0, 0, 0, 0, Specification(kVersion30));
+ VALIDATE(s, "{ \"wprop\": true }", true);
+ INVALIDATE_(s, "{ \"wprop\": true }", "/properties/wprop", "writeOnly", "/wprop",
+ "{ \"writeOnly\": {"
+ " \"errorCode\": 27, \"instanceRef\": \"#/wprop\", \"schemaRef\": \"#/properties/wprop\""
+ " }"
+ "}",
+ kValidateDefaultFlags | kValidateReadFlag, SchemaValidator, Pointer);
+}
+
+TEST(SchemaValidator, NullableTrue) {
+ Document sd;
+ sd.Parse("{\"type\": \"string\", \"nullable\": true}");
+ SchemaDocument s(sd, 0, 0, 0, 0, 0, kVersion20);
+
+ VALIDATE(s, "\"hello\"", true);
+ INVALIDATE(s, "null", "", "type", "",
+ "{ \"type\": {"
+ " \"errorCode\": 20,"
+ " \"instanceRef\": \"#\", \"schemaRef\": \"#\","
+ " \"expected\": [\"string\"], \"actual\": \"null\""
+ "}}");
+ INVALIDATE(s, "false", "", "type", "",
+ "{ \"type\": {"
+ " \"errorCode\": 20,"
+ " \"instanceRef\": \"#\", \"schemaRef\": \"#\","
+ " \"expected\": [\"string\"], \"actual\": \"boolean\""
+ "}}");
+
+ SchemaDocument s30(sd, 0, 0, 0, 0, 0, kVersion30);
+
+ VALIDATE(s30, "\"hello\"", true);
+ VALIDATE(s30, "null", true);
+ INVALIDATE(s30, "false", "", "type", "",
+ "{ \"type\": {"
+ " \"errorCode\": 20,"
+ " \"instanceRef\": \"#\", \"schemaRef\": \"#\","
+ " \"expected\": [\"null\", \"string\"], \"actual\": \"boolean\""
+ "}}");
+}
+
+TEST(SchemaValidator, NullableFalse) {
+ Document sd;
+ sd.Parse("{\"type\": \"string\", \"nullable\": false}");
+ SchemaDocument s(sd, 0, 0, 0, 0, 0, kVersion20);
+
+ VALIDATE(s, "\"hello\"", true);
+ INVALIDATE(s, "null", "", "type", "",
+ "{ \"type\": {"
+ " \"errorCode\": 20,"
+ " \"instanceRef\": \"#\", \"schemaRef\": \"#\","
+ " \"expected\": [\"string\"], \"actual\": \"null\""
+ "}}");
+ INVALIDATE(s, "false", "", "type", "",
+ "{ \"type\": {"
+ " \"errorCode\": 20,"
+ " \"instanceRef\": \"#\", \"schemaRef\": \"#\","
+ " \"expected\": [\"string\"], \"actual\": \"boolean\""
+ "}}");
+
+ SchemaDocument s30(sd, 0, 0, 0, 0, 0, kVersion30);
+
+ VALIDATE(s30, "\"hello\"", true);
+ INVALIDATE(s, "null", "", "type", "",
+ "{ \"type\": {"
+ " \"errorCode\": 20,"
+ " \"instanceRef\": \"#\", \"schemaRef\": \"#\","
+ " \"expected\": [\"string\"], \"actual\": \"null\""
+ "}}");
+ INVALIDATE(s30, "false", "", "type", "",
+ "{ \"type\": {"
+ " \"errorCode\": 20,"
+ " \"instanceRef\": \"#\", \"schemaRef\": \"#\","
+ " \"expected\": [\"string\"], \"actual\": \"boolean\""
+ "}}");
+}
+
#if defined(_MSC_VER) || defined(__clang__)
RAPIDJSON_DIAG_POP
#endif
diff --git a/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/unittest/simdtest.cpp b/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/unittest/simdtest.cpp
index 924fd5c1b35..1e1b937cf3f 100644
--- a/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/unittest/simdtest.cpp
+++ b/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/unittest/simdtest.cpp
@@ -49,10 +49,12 @@ using namespace rapidjson_simd;
#define SIMD_SUFFIX(name) name
#endif
+#define SIMD_SIZE_ALIGN(n) ((size_t(n) + 15) & ~size_t(15))
+
template <typename StreamType>
void TestSkipWhitespace() {
for (size_t step = 1; step < 32; step++) {
- char buffer[1025];
+ char buffer[SIMD_SIZE_ALIGN(1025)];
for (size_t i = 0; i < 1024; i++)
buffer[i] = " \t\r\n"[i % 4];
for (size_t i = 0; i < 1024; i += step)
@@ -79,7 +81,7 @@ TEST(SIMD, SIMD_SUFFIX(SkipWhitespace)) {
TEST(SIMD, SIMD_SUFFIX(SkipWhitespace_EncodedMemoryStream)) {
for (size_t step = 1; step < 32; step++) {
- char buffer[1024];
+ char buffer[SIMD_SIZE_ALIGN(1024)];
for (size_t i = 0; i < 1024; i++)
buffer[i] = " \t\r\n"[i % 4];
for (size_t i = 0; i < 1024; i += step)
@@ -87,14 +89,12 @@ TEST(SIMD, SIMD_SUFFIX(SkipWhitespace_EncodedMemoryStream)) {
MemoryStream ms(buffer, 1024);
EncodedInputStream<UTF8<>, MemoryStream> s(ms);
- size_t i = 0;
for (;;) {
SkipWhitespace(s);
if (s.Peek() == '\0')
break;
//EXPECT_EQ(i, s.Tell());
EXPECT_EQ('X', s.Take());
- i += step;
}
}
}
@@ -109,8 +109,8 @@ struct ScanCopyUnescapedStringHandler : BaseReaderHandler<UTF8<>, ScanCopyUnesca
template <unsigned parseFlags, typename StreamType>
void TestScanCopyUnescapedString() {
- char buffer[1024u + 5 + 32];
- char backup[1024u + 5 + 32];
+ char buffer[SIMD_SIZE_ALIGN(1024u + 5 + 32)];
+ char backup[SIMD_SIZE_ALIGN(1024u + 5 + 32)];
// Test "ABCDABCD...\\"
for (size_t offset = 0; offset < 32; offset++) {
@@ -167,7 +167,7 @@ TEST(SIMD, SIMD_SUFFIX(ScanCopyUnescapedString)) {
}
TEST(SIMD, SIMD_SUFFIX(ScanWriteUnescapedString)) {
- char buffer[2048 + 1 + 32];
+ char buffer[SIMD_SIZE_ALIGN(2048 + 1 + 32)];
for (size_t offset = 0; offset < 32; offset++) {
for (size_t step = 0; step < 1024; step++) {
char* s = buffer + offset;
diff --git a/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/unittest/uritest.cpp b/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/unittest/uritest.cpp
index 5506aa1e8c9..789c9dd828b 100644
--- a/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/unittest/uritest.cpp
+++ b/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/unittest/uritest.cpp
@@ -48,7 +48,6 @@ TEST(Uri, DefaultConstructor) {
EXPECT_TRUE(u.GetStringLength() == 0);
}
-
TEST(Uri, Parse) {
typedef GenericUri<Value, MemoryPoolAllocator<> > UriType;
MemoryPoolAllocator<CrtAllocator> allocator;
@@ -66,21 +65,8 @@ TEST(Uri, Parse) {
u.Get(w, allocator);
EXPECT_TRUE(*w.GetString() == *v.GetString());
-#if RAPIDJSON_HAS_STDSTRING
- typedef std::basic_string<Value::Ch> String;
- String str = "http://auth/path/xxx?query#frag";
- const UriType uri = UriType(str);
- EXPECT_TRUE(UriType::GetScheme(uri) == "http:");
- EXPECT_TRUE(UriType::GetAuth(uri) == "//auth");
- EXPECT_TRUE(UriType::GetPath(uri) == "/path/xxx");
- EXPECT_TRUE(UriType::GetBase(uri) == "http://auth/path/xxx?query");
- EXPECT_TRUE(UriType::GetQuery(uri) == "?query");
- EXPECT_TRUE(UriType::GetFrag(uri) == "#frag");
- EXPECT_TRUE(UriType::Get(uri) == str);
-#endif
-
v.SetString("urn:uuid:ee564b8a-7a87-4125-8c96-e9f123d6766f", allocator);
- u = UriType(v);
+ u = UriType(v, &allocator);
EXPECT_TRUE(StrCmp(u.GetSchemeString(), "urn:") == 0);
EXPECT_TRUE(u.GetAuthStringLength() == 0);
EXPECT_TRUE(StrCmp(u.GetPathString(), "uuid:ee564b8a-7a87-4125-8c96-e9f123d6766f") == 0);
@@ -91,7 +77,7 @@ TEST(Uri, Parse) {
EXPECT_TRUE(*w.GetString() == *v.GetString());
v.SetString("", allocator);
- u = UriType(v);
+ u = UriType(v, &allocator);
EXPECT_TRUE(u.GetSchemeStringLength() == 0);
EXPECT_TRUE(u.GetAuthStringLength() == 0);
EXPECT_TRUE(u.GetPathStringLength() == 0);
@@ -100,7 +86,7 @@ TEST(Uri, Parse) {
EXPECT_TRUE(u.GetFragStringLength() == 0);
v.SetString("http://auth/", allocator);
- u = UriType(v);
+ u = UriType(v, &allocator);
EXPECT_TRUE(StrCmp(u.GetSchemeString(), "http:") == 0);
EXPECT_TRUE(StrCmp(u.GetAuthString(), "//auth") == 0);
EXPECT_TRUE(StrCmp(u.GetPathString(), "/") == 0);
@@ -162,12 +148,11 @@ TEST(Uri, Parse) {
EXPECT_TRUE(u.GetFragStringLength() == len);
// Incomplete auth treated as path
- str = "http:/";
- const UriType u2 = UriType(str);
- EXPECT_TRUE(StrCmp(u2.GetSchemeString(), "http:") == 0);
- EXPECT_TRUE(u2.GetAuthStringLength() == 0);
- EXPECT_TRUE(StrCmp(u2.GetPathString(), "/") == 0);
- EXPECT_TRUE(StrCmp(u2.GetBaseString(), "http:/") == 0);
+ u = UriType("http:/");
+ EXPECT_TRUE(StrCmp(u.GetSchemeString(), "http:") == 0);
+ EXPECT_TRUE(u.GetAuthStringLength() == 0);
+ EXPECT_TRUE(StrCmp(u.GetPathString(), "/") == 0);
+ EXPECT_TRUE(StrCmp(u.GetBaseString(), "http:/") == 0);
}
TEST(Uri, Parse_UTF16) {
@@ -188,21 +173,8 @@ TEST(Uri, Parse_UTF16) {
u.Get(w, allocator);
EXPECT_TRUE(*w.GetString() == *v.GetString());
-#if RAPIDJSON_HAS_STDSTRING
- typedef std::basic_string<Value16::Ch> String;
- String str = L"http://auth/path/xxx?query#frag";
- const UriType uri = UriType(str);
- EXPECT_TRUE(UriType::GetScheme(uri) == L"http:");
- EXPECT_TRUE(UriType::GetAuth(uri) == L"//auth");
- EXPECT_TRUE(UriType::GetPath(uri) == L"/path/xxx");
- EXPECT_TRUE(UriType::GetBase(uri) == L"http://auth/path/xxx?query");
- EXPECT_TRUE(UriType::GetQuery(uri) == L"?query");
- EXPECT_TRUE(UriType::GetFrag(uri) == L"#frag");
- EXPECT_TRUE(UriType::Get(uri) == str);
-#endif
-
v.SetString(L"urn:uuid:ee564b8a-7a87-4125-8c96-e9f123d6766f", allocator);
- u = UriType(v);
+ u = UriType(v, &allocator);
EXPECT_TRUE(StrCmp(u.GetSchemeString(), L"urn:") == 0);
EXPECT_TRUE(u.GetAuthStringLength() == 0);
EXPECT_TRUE(StrCmp(u.GetPathString(), L"uuid:ee564b8a-7a87-4125-8c96-e9f123d6766f") == 0);
@@ -213,7 +185,7 @@ TEST(Uri, Parse_UTF16) {
EXPECT_TRUE(*w.GetString() == *v.GetString());
v.SetString(L"", allocator);
- u = UriType(v);
+ u = UriType(v, &allocator);
EXPECT_TRUE(u.GetSchemeStringLength() == 0);
EXPECT_TRUE(u.GetAuthStringLength() == 0);
EXPECT_TRUE(u.GetPathStringLength() == 0);
@@ -222,7 +194,7 @@ TEST(Uri, Parse_UTF16) {
EXPECT_TRUE(u.GetFragStringLength() == 0);
v.SetString(L"http://auth/", allocator);
- u = UriType(v);
+ u = UriType(v, &allocator);
EXPECT_TRUE(StrCmp(u.GetSchemeString(), L"http:") == 0);
EXPECT_TRUE(StrCmp(u.GetAuthString(), L"//auth") == 0);
EXPECT_TRUE(StrCmp(u.GetPathString(), L"/") == 0);
@@ -291,6 +263,41 @@ TEST(Uri, Parse_UTF16) {
EXPECT_TRUE(StrCmp(u.GetBaseString(), L"http:/") == 0);
}
+#if RAPIDJSON_HAS_STDSTRING
+TEST(Uri, Parse_Std) {
+ typedef GenericUri<Value, MemoryPoolAllocator<> > UriType;
+ MemoryPoolAllocator<CrtAllocator> allocator;
+ typedef std::basic_string<Value::Ch> String;
+
+ String str = "http://auth/path/xxx?query#frag";
+ const UriType uri = UriType(str, &allocator);
+ EXPECT_TRUE(UriType::GetScheme(uri) == "http:");
+ EXPECT_TRUE(UriType::GetAuth(uri) == "//auth");
+ EXPECT_TRUE(UriType::GetPath(uri) == "/path/xxx");
+ EXPECT_TRUE(UriType::GetBase(uri) == "http://auth/path/xxx?query");
+ EXPECT_TRUE(UriType::GetQuery(uri) == "?query");
+ EXPECT_TRUE(UriType::GetFrag(uri) == "#frag");
+ EXPECT_TRUE(UriType::Get(uri) == str);
+}
+
+TEST(Uri, Parse_UTF16_Std) {
+ typedef GenericValue<UTF16<> > Value16;
+ typedef GenericUri<Value16, MemoryPoolAllocator<> > UriType;
+ MemoryPoolAllocator<CrtAllocator> allocator;
+ typedef std::basic_string<Value16::Ch> String;
+
+ String str = L"http://auth/path/xxx?query#frag";
+ const UriType uri = UriType(str, &allocator);
+ EXPECT_TRUE(UriType::GetScheme(uri) == L"http:");
+ EXPECT_TRUE(UriType::GetAuth(uri) == L"//auth");
+ EXPECT_TRUE(UriType::GetPath(uri) == L"/path/xxx");
+ EXPECT_TRUE(UriType::GetBase(uri) == L"http://auth/path/xxx?query");
+ EXPECT_TRUE(UriType::GetQuery(uri) == L"?query");
+ EXPECT_TRUE(UriType::GetFrag(uri) == L"#frag");
+ EXPECT_TRUE(UriType::Get(uri) == str);
+}
+#endif
+
TEST(Uri, CopyConstructor) {
typedef GenericUri<Value> UriType;
CrtAllocator allocator;
diff --git a/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/unittest/valuetest.cpp b/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/unittest/valuetest.cpp
index 6ef22b72600..e0e40a26521 100644
--- a/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/unittest/valuetest.cpp
+++ b/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/unittest/valuetest.cpp
@@ -1581,7 +1581,7 @@ TEST(Value, ObjectHelperRangeFor) {
{
int i = 0;
for (auto& m : x.GetObject()) {
- char name[10];
+ char name[11];
sprintf(name, "%d", i);
EXPECT_STREQ(name, m.name.GetString());
EXPECT_EQ(i, m.value.GetInt());
@@ -1592,7 +1592,7 @@ TEST(Value, ObjectHelperRangeFor) {
{
int i = 0;
for (const auto& m : const_cast<const Value&>(x).GetObject()) {
- char name[10];
+ char name[11];
sprintf(name, "%d", i);
EXPECT_STREQ(name, m.name.GetString());
EXPECT_EQ(i, m.value.GetInt());
@@ -1717,17 +1717,17 @@ static void TestShortStringOptimization(const char* str) {
rapidjson::Value val;
val.SetString(str, len, doc.GetAllocator());
- EXPECT_EQ(val.GetStringLength(), len);
- EXPECT_STREQ(val.GetString(), str);
+ EXPECT_EQ(val.GetStringLength(), len);
+ EXPECT_STREQ(val.GetString(), str);
}
TEST(Value, AllocateShortString) {
- TestShortStringOptimization(""); // edge case: empty string
- TestShortStringOptimization("12345678"); // regular case for short strings: 8 chars
- TestShortStringOptimization("12345678901"); // edge case: 11 chars in 32-bit mode (=> short string)
- TestShortStringOptimization("123456789012"); // edge case: 12 chars in 32-bit mode (=> regular string)
- TestShortStringOptimization("123456789012345"); // edge case: 15 chars in 64-bit mode (=> short string)
- TestShortStringOptimization("1234567890123456"); // edge case: 16 chars in 64-bit mode (=> regular string)
+ TestShortStringOptimization(""); // edge case: empty string
+ TestShortStringOptimization("12345678"); // regular case for short strings: 8 chars
+ TestShortStringOptimization("12345678901"); // edge case: 11 chars in 32-bit mode (=> short string)
+ TestShortStringOptimization("123456789012"); // edge case: 12 chars in 32-bit mode (=> regular string)
+ TestShortStringOptimization("123456789012345"); // edge case: 15 chars in 64-bit mode (=> short string)
+ TestShortStringOptimization("1234567890123456"); // edge case: 16 chars in 64-bit mode (=> regular string)
}
template <int e>
diff --git a/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/valgrind.supp b/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/valgrind.supp
index 1fed18bea3c..c9d3d226569 100644
--- a/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/valgrind.supp
+++ b/Build/source/utils/asymptote/LspCpp/third_party/rapidjson/test/valgrind.supp
@@ -15,3 +15,12 @@
Memcheck:Value8
fun:__wcslen_sse2
}
+
+{
+ Suppress wmemcmp valgrind report 4
+ Memcheck:Addr32
+ fun:__wmemcmp_avx2_movbe
+ ...
+ fun:*Uri*Parse_UTF16_Std*
+}
+
diff --git a/Build/source/utils/asymptote/LspCpp/third_party/uri/CMakeFiles/CMakeDirectoryInformation.cmake b/Build/source/utils/asymptote/LspCpp/third_party/uri/CMakeFiles/CMakeDirectoryInformation.cmake
index 0af0e082c51..479ad12135c 100644
--- a/Build/source/utils/asymptote/LspCpp/third_party/uri/CMakeFiles/CMakeDirectoryInformation.cmake
+++ b/Build/source/utils/asymptote/LspCpp/third_party/uri/CMakeFiles/CMakeDirectoryInformation.cmake
@@ -1,9 +1,9 @@
# CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.25
+# Generated by "Unix Makefiles" Generator, CMake Version 3.27
# Relative path conversion top directories.
-set(CMAKE_RELATIVE_PATH_TOP_SOURCE "/usr/local/src/asymptote-2.85/LspCpp")
-set(CMAKE_RELATIVE_PATH_TOP_BINARY "/usr/local/src/asymptote-2.85/LspCpp")
+set(CMAKE_RELATIVE_PATH_TOP_SOURCE "/usr/local/src/asymptote-2.87/LspCpp")
+set(CMAKE_RELATIVE_PATH_TOP_BINARY "/usr/local/src/asymptote-2.87/LspCpp")
# Force unix paths in dependencies.
set(CMAKE_FORCE_UNIX_PATHS 1)
diff --git a/Build/source/utils/asymptote/LspCpp/third_party/uri/CMakeFiles/doc.dir/DependInfo.cmake b/Build/source/utils/asymptote/LspCpp/third_party/uri/CMakeFiles/doc.dir/DependInfo.cmake
index dc55e44b555..45a25b7803e 100644
--- a/Build/source/utils/asymptote/LspCpp/third_party/uri/CMakeFiles/doc.dir/DependInfo.cmake
+++ b/Build/source/utils/asymptote/LspCpp/third_party/uri/CMakeFiles/doc.dir/DependInfo.cmake
@@ -10,8 +10,8 @@ set(CMAKE_DEPENDS_LANGUAGES
set(CMAKE_DEPENDS_DEPENDENCY_FILES
)
-# Targets to which this target links.
-set(CMAKE_TARGET_LINKED_INFO_FILES
+# Targets to which this target links which contain Fortran sources.
+set(CMAKE_Fortran_TARGET_LINKED_INFO_FILES
)
# Fortran module output directory.
diff --git a/Build/source/utils/asymptote/LspCpp/third_party/uri/CMakeFiles/doc.dir/build.make b/Build/source/utils/asymptote/LspCpp/third_party/uri/CMakeFiles/doc.dir/build.make
index 994bfaa5af2..791ab479aaf 100644
--- a/Build/source/utils/asymptote/LspCpp/third_party/uri/CMakeFiles/doc.dir/build.make
+++ b/Build/source/utils/asymptote/LspCpp/third_party/uri/CMakeFiles/doc.dir/build.make
@@ -1,5 +1,5 @@
# CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.25
+# Generated by "Unix Makefiles" Generator, CMake Version 3.27
# Delete rule output on recipe failure.
.DELETE_ON_ERROR:
@@ -56,10 +56,10 @@ RM = /usr/bin/cmake -E rm -f
EQUALS = =
# The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /usr/local/src/asymptote-2.85/LspCpp
+CMAKE_SOURCE_DIR = /usr/local/src/asymptote-2.87/LspCpp
# The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /usr/local/src/asymptote-2.85/LspCpp
+CMAKE_BINARY_DIR = /usr/local/src/asymptote-2.87/LspCpp
# Utility rule file for doc.
@@ -70,8 +70,8 @@ include third_party/uri/CMakeFiles/doc.dir/compiler_depend.make
include third_party/uri/CMakeFiles/doc.dir/progress.make
third_party/uri/CMakeFiles/doc:
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --blue --bold --progress-dir=/usr/local/src/asymptote-2.85/LspCpp/CMakeFiles --progress-num=$(CMAKE_PROGRESS_1) "Generating API documentation with Doxygen"
- cd /usr/local/src/asymptote-2.85/LspCpp/third_party/uri && /bin/doxygen /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/Doxyfile
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --blue --bold --progress-dir=/usr/local/src/asymptote-2.87/LspCpp/CMakeFiles --progress-num=$(CMAKE_PROGRESS_1) "Generating API documentation with Doxygen"
+ cd /usr/local/src/asymptote-2.87/LspCpp/third_party/uri && /bin/doxygen /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/Doxyfile
doc: third_party/uri/CMakeFiles/doc
doc: third_party/uri/CMakeFiles/doc.dir/build.make
@@ -82,10 +82,10 @@ third_party/uri/CMakeFiles/doc.dir/build: doc
.PHONY : third_party/uri/CMakeFiles/doc.dir/build
third_party/uri/CMakeFiles/doc.dir/clean:
- cd /usr/local/src/asymptote-2.85/LspCpp/third_party/uri && $(CMAKE_COMMAND) -P CMakeFiles/doc.dir/cmake_clean.cmake
+ cd /usr/local/src/asymptote-2.87/LspCpp/third_party/uri && $(CMAKE_COMMAND) -P CMakeFiles/doc.dir/cmake_clean.cmake
.PHONY : third_party/uri/CMakeFiles/doc.dir/clean
third_party/uri/CMakeFiles/doc.dir/depend:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /usr/local/src/asymptote-2.85/LspCpp /usr/local/src/asymptote-2.85/LspCpp/third_party/uri /usr/local/src/asymptote-2.85/LspCpp /usr/local/src/asymptote-2.85/LspCpp/third_party/uri /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/CMakeFiles/doc.dir/DependInfo.cmake --color=$(COLOR)
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /usr/local/src/asymptote-2.87/LspCpp /usr/local/src/asymptote-2.87/LspCpp/third_party/uri /usr/local/src/asymptote-2.87/LspCpp /usr/local/src/asymptote-2.87/LspCpp/third_party/uri /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/CMakeFiles/doc.dir/DependInfo.cmake "--color=$(COLOR)"
.PHONY : third_party/uri/CMakeFiles/doc.dir/depend
diff --git a/Build/source/utils/asymptote/LspCpp/third_party/uri/Doxyfile b/Build/source/utils/asymptote/LspCpp/third_party/uri/Doxyfile
index 330b39dfa1c..b1b0845637b 100644
--- a/Build/source/utils/asymptote/LspCpp/third_party/uri/Doxyfile
+++ b/Build/source/utils/asymptote/LspCpp/third_party/uri/Doxyfile
@@ -128,7 +128,7 @@ FULL_PATH_NAMES = YES
# If left blank the directory from which doxygen is run is used as the
# path to strip.
-STRIP_FROM_PATH = /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/
+STRIP_FROM_PATH = /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/
# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
# the path mentioned in the documentation of a class, which tells
@@ -626,7 +626,7 @@ WARN_LOGFILE =
# directories like "/usr/src/myproject". Separate the files or directories
# with spaces.
-INPUT = /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include
+INPUT = /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include
# This tag can be used to specify the character encoding of the source files
# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
@@ -658,7 +658,7 @@ RECURSIVE = YES
# Note that relative paths are relative to the directory from which doxygen is
# run.
-EXCLUDE = /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/detail
+EXCLUDE = /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/detail
# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
# directories that are symbolic links (a Unix file system feature) are excluded
@@ -821,7 +821,7 @@ COLS_IN_ALPHA_INDEX = 5
# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
# should be ignored while generating the index headers.
-IGNORE_PREFIX = /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/uri/src/
+IGNORE_PREFIX = /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/uri/src/
#---------------------------------------------------------------------------
# configuration options related to the HTML output
diff --git a/Build/source/utils/asymptote/LspCpp/third_party/uri/Makefile b/Build/source/utils/asymptote/LspCpp/third_party/uri/Makefile
index 39e5192cbf6..c5a1aa7ac5d 100644
--- a/Build/source/utils/asymptote/LspCpp/third_party/uri/Makefile
+++ b/Build/source/utils/asymptote/LspCpp/third_party/uri/Makefile
@@ -1,5 +1,5 @@
# CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.25
+# Generated by "Unix Makefiles" Generator, CMake Version 3.27
# Default target executed when no arguments are given to make.
default_target: all
@@ -60,17 +60,17 @@ RM = /usr/bin/cmake -E rm -f
EQUALS = =
# The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /usr/local/src/asymptote-2.85/LspCpp
+CMAKE_SOURCE_DIR = /usr/local/src/asymptote-2.87/LspCpp
# The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /usr/local/src/asymptote-2.85/LspCpp
+CMAKE_BINARY_DIR = /usr/local/src/asymptote-2.87/LspCpp
#=============================================================================
# Targets provided globally by CMake.
# Special rule for the target edit_cache
edit_cache:
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Running CMake cache editor..."
/usr/bin/ccmake -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
.PHONY : edit_cache
@@ -80,7 +80,7 @@ edit_cache/fast: edit_cache
# Special rule for the target rebuild_cache
rebuild_cache:
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Running CMake to regenerate build system..."
/usr/bin/cmake --regenerate-during-build -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
.PHONY : rebuild_cache
@@ -90,7 +90,7 @@ rebuild_cache/fast: rebuild_cache
# Special rule for the target list_install_components
list_install_components:
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Available install components are: \"Unspecified\""
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Available install components are: \"Unspecified\""
.PHONY : list_install_components
# Special rule for the target list_install_components
@@ -99,50 +99,50 @@ list_install_components/fast: list_install_components
# Special rule for the target install
install: preinstall
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Install the project..."
/usr/bin/cmake -P cmake_install.cmake
.PHONY : install
# Special rule for the target install
install/fast: preinstall/fast
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Install the project..."
/usr/bin/cmake -P cmake_install.cmake
.PHONY : install/fast
# Special rule for the target install/local
install/local: preinstall
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Installing only the local directory..."
/usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
.PHONY : install/local
# Special rule for the target install/local
install/local/fast: preinstall/fast
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Installing only the local directory..."
/usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
.PHONY : install/local/fast
# Special rule for the target install/strip
install/strip: preinstall
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Installing the project stripped..."
/usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
.PHONY : install/strip
# Special rule for the target install/strip
install/strip/fast: preinstall/fast
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Installing the project stripped..."
/usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
.PHONY : install/strip/fast
# The main all target
all: cmake_check_build_system
- cd /usr/local/src/asymptote-2.85/LspCpp && $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/src/asymptote-2.85/LspCpp/CMakeFiles /usr/local/src/asymptote-2.85/LspCpp/third_party/uri//CMakeFiles/progress.marks
- cd /usr/local/src/asymptote-2.85/LspCpp && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 third_party/uri/all
- $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/src/asymptote-2.85/LspCpp/CMakeFiles 0
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/src/asymptote-2.87/LspCpp/CMakeFiles /usr/local/src/asymptote-2.87/LspCpp/third_party/uri//CMakeFiles/progress.marks
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 third_party/uri/all
+ $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/src/asymptote-2.87/LspCpp/CMakeFiles 0
.PHONY : all
# The main clean target
clean:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 third_party/uri/clean
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 third_party/uri/clean
.PHONY : clean
# The main clean target
@@ -151,22 +151,22 @@ clean/fast: clean
# Prepare targets for installation.
preinstall: all
- cd /usr/local/src/asymptote-2.85/LspCpp && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 third_party/uri/preinstall
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 third_party/uri/preinstall
.PHONY : preinstall
# Prepare targets for installation.
preinstall/fast:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 third_party/uri/preinstall
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 third_party/uri/preinstall
.PHONY : preinstall/fast
# clear depends
depend:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
.PHONY : depend
# Convenience name for target.
third_party/uri/CMakeFiles/doc.dir/rule:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 third_party/uri/CMakeFiles/doc.dir/rule
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 third_party/uri/CMakeFiles/doc.dir/rule
.PHONY : third_party/uri/CMakeFiles/doc.dir/rule
# Convenience name for target.
@@ -175,7 +175,7 @@ doc: third_party/uri/CMakeFiles/doc.dir/rule
# fast build rule for target.
doc/fast:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/CMakeFiles/doc.dir/build.make third_party/uri/CMakeFiles/doc.dir/build
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/CMakeFiles/doc.dir/build.make third_party/uri/CMakeFiles/doc.dir/build
.PHONY : doc/fast
# Help Target
@@ -202,6 +202,6 @@ help:
# No rule that depends on this can have commands that come from listfiles
# because they might be regenerated.
cmake_check_build_system:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
.PHONY : cmake_check_build_system
diff --git a/Build/source/utils/asymptote/LspCpp/third_party/uri/cmake_install.cmake b/Build/source/utils/asymptote/LspCpp/third_party/uri/cmake_install.cmake
index e62d7db6668..8601f086b2c 100644
--- a/Build/source/utils/asymptote/LspCpp/third_party/uri/cmake_install.cmake
+++ b/Build/source/utils/asymptote/LspCpp/third_party/uri/cmake_install.cmake
@@ -1,4 +1,4 @@
-# Install script for directory: /usr/local/src/asymptote-2.85/LspCpp/third_party/uri
+# Install script for directory: /usr/local/src/asymptote-2.87/LspCpp/third_party/uri
# Set the install prefix
if(NOT DEFINED CMAKE_INSTALL_PREFIX)
@@ -43,12 +43,12 @@ if(NOT DEFINED CMAKE_OBJDUMP)
endif()
if(CMAKE_INSTALL_COMPONENT STREQUAL "Unspecified" OR NOT CMAKE_INSTALL_COMPONENT)
- file(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/." TYPE DIRECTORY FILES "/usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include")
+ file(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/." TYPE DIRECTORY FILES "/usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include")
endif()
if(NOT CMAKE_INSTALL_LOCAL_ONLY)
# Include the install script for each subdirectory.
- include("/usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/cmake_install.cmake")
+ include("/usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/cmake_install.cmake")
endif()
diff --git a/Build/source/utils/asymptote/LspCpp/third_party/uri/src/CMakeFiles/CMakeDirectoryInformation.cmake b/Build/source/utils/asymptote/LspCpp/third_party/uri/src/CMakeFiles/CMakeDirectoryInformation.cmake
index 0af0e082c51..479ad12135c 100644
--- a/Build/source/utils/asymptote/LspCpp/third_party/uri/src/CMakeFiles/CMakeDirectoryInformation.cmake
+++ b/Build/source/utils/asymptote/LspCpp/third_party/uri/src/CMakeFiles/CMakeDirectoryInformation.cmake
@@ -1,9 +1,9 @@
# CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.25
+# Generated by "Unix Makefiles" Generator, CMake Version 3.27
# Relative path conversion top directories.
-set(CMAKE_RELATIVE_PATH_TOP_SOURCE "/usr/local/src/asymptote-2.85/LspCpp")
-set(CMAKE_RELATIVE_PATH_TOP_BINARY "/usr/local/src/asymptote-2.85/LspCpp")
+set(CMAKE_RELATIVE_PATH_TOP_SOURCE "/usr/local/src/asymptote-2.87/LspCpp")
+set(CMAKE_RELATIVE_PATH_TOP_BINARY "/usr/local/src/asymptote-2.87/LspCpp")
# Force unix paths in dependencies.
set(CMAKE_FORCE_UNIX_PATHS 1)
diff --git a/Build/source/utils/asymptote/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/DependInfo.cmake b/Build/source/utils/asymptote/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/DependInfo.cmake
index 3ce1ac6ff19..e18c2d5c197 100644
--- a/Build/source/utils/asymptote/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/DependInfo.cmake
+++ b/Build/source/utils/asymptote/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/DependInfo.cmake
@@ -8,18 +8,18 @@ set(CMAKE_DEPENDS_LANGUAGES
# The set of dependency files which are needed:
set(CMAKE_DEPENDS_DEPENDENCY_FILES
- "/usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_advance_parts.cpp" "third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.o" "gcc" "third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.o.d"
- "/usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_normalize.cpp" "third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.o" "gcc" "third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.o.d"
- "/usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_parse.cpp" "third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse.cpp.o" "gcc" "third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse.cpp.o.d"
- "/usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_parse_authority.cpp" "third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.o" "gcc" "third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.o.d"
- "/usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_resolve.cpp" "third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.o" "gcc" "third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.o.d"
- "/usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/uri.cpp" "third_party/uri/src/CMakeFiles/network-uri.dir/uri.cpp.o" "gcc" "third_party/uri/src/CMakeFiles/network-uri.dir/uri.cpp.o.d"
- "/usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/uri_builder.cpp" "third_party/uri/src/CMakeFiles/network-uri.dir/uri_builder.cpp.o" "gcc" "third_party/uri/src/CMakeFiles/network-uri.dir/uri_builder.cpp.o.d"
- "/usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/uri_errors.cpp" "third_party/uri/src/CMakeFiles/network-uri.dir/uri_errors.cpp.o" "gcc" "third_party/uri/src/CMakeFiles/network-uri.dir/uri_errors.cpp.o.d"
+ "/usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_advance_parts.cpp" "third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.o" "gcc" "third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.o.d"
+ "/usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_normalize.cpp" "third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.o" "gcc" "third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.o.d"
+ "/usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_parse.cpp" "third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse.cpp.o" "gcc" "third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse.cpp.o.d"
+ "/usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_parse_authority.cpp" "third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.o" "gcc" "third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.o.d"
+ "/usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_resolve.cpp" "third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.o" "gcc" "third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.o.d"
+ "/usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/uri.cpp" "third_party/uri/src/CMakeFiles/network-uri.dir/uri.cpp.o" "gcc" "third_party/uri/src/CMakeFiles/network-uri.dir/uri.cpp.o.d"
+ "/usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/uri_builder.cpp" "third_party/uri/src/CMakeFiles/network-uri.dir/uri_builder.cpp.o" "gcc" "third_party/uri/src/CMakeFiles/network-uri.dir/uri_builder.cpp.o.d"
+ "/usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/uri_errors.cpp" "third_party/uri/src/CMakeFiles/network-uri.dir/uri_errors.cpp.o" "gcc" "third_party/uri/src/CMakeFiles/network-uri.dir/uri_errors.cpp.o.d"
)
-# Targets to which this target links.
-set(CMAKE_TARGET_LINKED_INFO_FILES
+# Targets to which this target links which contain Fortran sources.
+set(CMAKE_Fortran_TARGET_LINKED_INFO_FILES
)
# Fortran module output directory.
diff --git a/Build/source/utils/asymptote/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/build.make b/Build/source/utils/asymptote/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/build.make
index b61109a6d3b..f31af4df4ea 100644
--- a/Build/source/utils/asymptote/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/build.make
+++ b/Build/source/utils/asymptote/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/build.make
@@ -1,5 +1,5 @@
# CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.25
+# Generated by "Unix Makefiles" Generator, CMake Version 3.27
# Delete rule output on recipe failure.
.DELETE_ON_ERROR:
@@ -56,10 +56,10 @@ RM = /usr/bin/cmake -E rm -f
EQUALS = =
# The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /usr/local/src/asymptote-2.85/LspCpp
+CMAKE_SOURCE_DIR = /usr/local/src/asymptote-2.87/LspCpp
# The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /usr/local/src/asymptote-2.85/LspCpp
+CMAKE_BINARY_DIR = /usr/local/src/asymptote-2.87/LspCpp
# Include any dependencies generated for this target.
include third_party/uri/src/CMakeFiles/network-uri.dir/depend.make
@@ -75,114 +75,114 @@ include third_party/uri/src/CMakeFiles/network-uri.dir/flags.make
third_party/uri/src/CMakeFiles/network-uri.dir/uri.cpp.o: third_party/uri/src/CMakeFiles/network-uri.dir/flags.make
third_party/uri/src/CMakeFiles/network-uri.dir/uri.cpp.o: third_party/uri/src/uri.cpp
third_party/uri/src/CMakeFiles/network-uri.dir/uri.cpp.o: third_party/uri/src/CMakeFiles/network-uri.dir/compiler_depend.ts
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/usr/local/src/asymptote-2.85/LspCpp/CMakeFiles --progress-num=$(CMAKE_PROGRESS_1) "Building CXX object third_party/uri/src/CMakeFiles/network-uri.dir/uri.cpp.o"
- cd /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT third_party/uri/src/CMakeFiles/network-uri.dir/uri.cpp.o -MF CMakeFiles/network-uri.dir/uri.cpp.o.d -o CMakeFiles/network-uri.dir/uri.cpp.o -c /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/uri.cpp
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --green --progress-dir=/usr/local/src/asymptote-2.87/LspCpp/CMakeFiles --progress-num=$(CMAKE_PROGRESS_1) "Building CXX object third_party/uri/src/CMakeFiles/network-uri.dir/uri.cpp.o"
+ cd /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT third_party/uri/src/CMakeFiles/network-uri.dir/uri.cpp.o -MF CMakeFiles/network-uri.dir/uri.cpp.o.d -o CMakeFiles/network-uri.dir/uri.cpp.o -c /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/uri.cpp
third_party/uri/src/CMakeFiles/network-uri.dir/uri.cpp.i: cmake_force
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/network-uri.dir/uri.cpp.i"
- cd /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/uri.cpp > CMakeFiles/network-uri.dir/uri.cpp.i
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --green "Preprocessing CXX source to CMakeFiles/network-uri.dir/uri.cpp.i"
+ cd /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/uri.cpp > CMakeFiles/network-uri.dir/uri.cpp.i
third_party/uri/src/CMakeFiles/network-uri.dir/uri.cpp.s: cmake_force
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/network-uri.dir/uri.cpp.s"
- cd /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/uri.cpp -o CMakeFiles/network-uri.dir/uri.cpp.s
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --green "Compiling CXX source to assembly CMakeFiles/network-uri.dir/uri.cpp.s"
+ cd /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/uri.cpp -o CMakeFiles/network-uri.dir/uri.cpp.s
third_party/uri/src/CMakeFiles/network-uri.dir/uri_builder.cpp.o: third_party/uri/src/CMakeFiles/network-uri.dir/flags.make
third_party/uri/src/CMakeFiles/network-uri.dir/uri_builder.cpp.o: third_party/uri/src/uri_builder.cpp
third_party/uri/src/CMakeFiles/network-uri.dir/uri_builder.cpp.o: third_party/uri/src/CMakeFiles/network-uri.dir/compiler_depend.ts
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/usr/local/src/asymptote-2.85/LspCpp/CMakeFiles --progress-num=$(CMAKE_PROGRESS_2) "Building CXX object third_party/uri/src/CMakeFiles/network-uri.dir/uri_builder.cpp.o"
- cd /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT third_party/uri/src/CMakeFiles/network-uri.dir/uri_builder.cpp.o -MF CMakeFiles/network-uri.dir/uri_builder.cpp.o.d -o CMakeFiles/network-uri.dir/uri_builder.cpp.o -c /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/uri_builder.cpp
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --green --progress-dir=/usr/local/src/asymptote-2.87/LspCpp/CMakeFiles --progress-num=$(CMAKE_PROGRESS_2) "Building CXX object third_party/uri/src/CMakeFiles/network-uri.dir/uri_builder.cpp.o"
+ cd /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT third_party/uri/src/CMakeFiles/network-uri.dir/uri_builder.cpp.o -MF CMakeFiles/network-uri.dir/uri_builder.cpp.o.d -o CMakeFiles/network-uri.dir/uri_builder.cpp.o -c /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/uri_builder.cpp
third_party/uri/src/CMakeFiles/network-uri.dir/uri_builder.cpp.i: cmake_force
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/network-uri.dir/uri_builder.cpp.i"
- cd /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/uri_builder.cpp > CMakeFiles/network-uri.dir/uri_builder.cpp.i
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --green "Preprocessing CXX source to CMakeFiles/network-uri.dir/uri_builder.cpp.i"
+ cd /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/uri_builder.cpp > CMakeFiles/network-uri.dir/uri_builder.cpp.i
third_party/uri/src/CMakeFiles/network-uri.dir/uri_builder.cpp.s: cmake_force
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/network-uri.dir/uri_builder.cpp.s"
- cd /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/uri_builder.cpp -o CMakeFiles/network-uri.dir/uri_builder.cpp.s
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --green "Compiling CXX source to assembly CMakeFiles/network-uri.dir/uri_builder.cpp.s"
+ cd /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/uri_builder.cpp -o CMakeFiles/network-uri.dir/uri_builder.cpp.s
third_party/uri/src/CMakeFiles/network-uri.dir/uri_errors.cpp.o: third_party/uri/src/CMakeFiles/network-uri.dir/flags.make
third_party/uri/src/CMakeFiles/network-uri.dir/uri_errors.cpp.o: third_party/uri/src/uri_errors.cpp
third_party/uri/src/CMakeFiles/network-uri.dir/uri_errors.cpp.o: third_party/uri/src/CMakeFiles/network-uri.dir/compiler_depend.ts
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/usr/local/src/asymptote-2.85/LspCpp/CMakeFiles --progress-num=$(CMAKE_PROGRESS_3) "Building CXX object third_party/uri/src/CMakeFiles/network-uri.dir/uri_errors.cpp.o"
- cd /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT third_party/uri/src/CMakeFiles/network-uri.dir/uri_errors.cpp.o -MF CMakeFiles/network-uri.dir/uri_errors.cpp.o.d -o CMakeFiles/network-uri.dir/uri_errors.cpp.o -c /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/uri_errors.cpp
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --green --progress-dir=/usr/local/src/asymptote-2.87/LspCpp/CMakeFiles --progress-num=$(CMAKE_PROGRESS_3) "Building CXX object third_party/uri/src/CMakeFiles/network-uri.dir/uri_errors.cpp.o"
+ cd /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT third_party/uri/src/CMakeFiles/network-uri.dir/uri_errors.cpp.o -MF CMakeFiles/network-uri.dir/uri_errors.cpp.o.d -o CMakeFiles/network-uri.dir/uri_errors.cpp.o -c /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/uri_errors.cpp
third_party/uri/src/CMakeFiles/network-uri.dir/uri_errors.cpp.i: cmake_force
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/network-uri.dir/uri_errors.cpp.i"
- cd /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/uri_errors.cpp > CMakeFiles/network-uri.dir/uri_errors.cpp.i
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --green "Preprocessing CXX source to CMakeFiles/network-uri.dir/uri_errors.cpp.i"
+ cd /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/uri_errors.cpp > CMakeFiles/network-uri.dir/uri_errors.cpp.i
third_party/uri/src/CMakeFiles/network-uri.dir/uri_errors.cpp.s: cmake_force
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/network-uri.dir/uri_errors.cpp.s"
- cd /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/uri_errors.cpp -o CMakeFiles/network-uri.dir/uri_errors.cpp.s
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --green "Compiling CXX source to assembly CMakeFiles/network-uri.dir/uri_errors.cpp.s"
+ cd /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/uri_errors.cpp -o CMakeFiles/network-uri.dir/uri_errors.cpp.s
third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse.cpp.o: third_party/uri/src/CMakeFiles/network-uri.dir/flags.make
third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse.cpp.o: third_party/uri/src/detail/uri_parse.cpp
third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse.cpp.o: third_party/uri/src/CMakeFiles/network-uri.dir/compiler_depend.ts
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/usr/local/src/asymptote-2.85/LspCpp/CMakeFiles --progress-num=$(CMAKE_PROGRESS_4) "Building CXX object third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse.cpp.o"
- cd /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse.cpp.o -MF CMakeFiles/network-uri.dir/detail/uri_parse.cpp.o.d -o CMakeFiles/network-uri.dir/detail/uri_parse.cpp.o -c /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_parse.cpp
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --green --progress-dir=/usr/local/src/asymptote-2.87/LspCpp/CMakeFiles --progress-num=$(CMAKE_PROGRESS_4) "Building CXX object third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse.cpp.o"
+ cd /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse.cpp.o -MF CMakeFiles/network-uri.dir/detail/uri_parse.cpp.o.d -o CMakeFiles/network-uri.dir/detail/uri_parse.cpp.o -c /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_parse.cpp
third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse.cpp.i: cmake_force
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/network-uri.dir/detail/uri_parse.cpp.i"
- cd /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_parse.cpp > CMakeFiles/network-uri.dir/detail/uri_parse.cpp.i
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --green "Preprocessing CXX source to CMakeFiles/network-uri.dir/detail/uri_parse.cpp.i"
+ cd /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_parse.cpp > CMakeFiles/network-uri.dir/detail/uri_parse.cpp.i
third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse.cpp.s: cmake_force
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/network-uri.dir/detail/uri_parse.cpp.s"
- cd /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_parse.cpp -o CMakeFiles/network-uri.dir/detail/uri_parse.cpp.s
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --green "Compiling CXX source to assembly CMakeFiles/network-uri.dir/detail/uri_parse.cpp.s"
+ cd /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_parse.cpp -o CMakeFiles/network-uri.dir/detail/uri_parse.cpp.s
third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.o: third_party/uri/src/CMakeFiles/network-uri.dir/flags.make
third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.o: third_party/uri/src/detail/uri_parse_authority.cpp
third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.o: third_party/uri/src/CMakeFiles/network-uri.dir/compiler_depend.ts
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/usr/local/src/asymptote-2.85/LspCpp/CMakeFiles --progress-num=$(CMAKE_PROGRESS_5) "Building CXX object third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.o"
- cd /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.o -MF CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.o.d -o CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.o -c /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_parse_authority.cpp
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --green --progress-dir=/usr/local/src/asymptote-2.87/LspCpp/CMakeFiles --progress-num=$(CMAKE_PROGRESS_5) "Building CXX object third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.o"
+ cd /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.o -MF CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.o.d -o CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.o -c /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_parse_authority.cpp
third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.i: cmake_force
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.i"
- cd /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_parse_authority.cpp > CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.i
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --green "Preprocessing CXX source to CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.i"
+ cd /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_parse_authority.cpp > CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.i
third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.s: cmake_force
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.s"
- cd /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_parse_authority.cpp -o CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.s
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --green "Compiling CXX source to assembly CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.s"
+ cd /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_parse_authority.cpp -o CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.s
third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.o: third_party/uri/src/CMakeFiles/network-uri.dir/flags.make
third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.o: third_party/uri/src/detail/uri_advance_parts.cpp
third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.o: third_party/uri/src/CMakeFiles/network-uri.dir/compiler_depend.ts
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/usr/local/src/asymptote-2.85/LspCpp/CMakeFiles --progress-num=$(CMAKE_PROGRESS_6) "Building CXX object third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.o"
- cd /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.o -MF CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.o.d -o CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.o -c /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_advance_parts.cpp
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --green --progress-dir=/usr/local/src/asymptote-2.87/LspCpp/CMakeFiles --progress-num=$(CMAKE_PROGRESS_6) "Building CXX object third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.o"
+ cd /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.o -MF CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.o.d -o CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.o -c /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_advance_parts.cpp
third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.i: cmake_force
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.i"
- cd /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_advance_parts.cpp > CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.i
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --green "Preprocessing CXX source to CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.i"
+ cd /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_advance_parts.cpp > CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.i
third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.s: cmake_force
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.s"
- cd /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_advance_parts.cpp -o CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.s
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --green "Compiling CXX source to assembly CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.s"
+ cd /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_advance_parts.cpp -o CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.s
third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.o: third_party/uri/src/CMakeFiles/network-uri.dir/flags.make
third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.o: third_party/uri/src/detail/uri_normalize.cpp
third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.o: third_party/uri/src/CMakeFiles/network-uri.dir/compiler_depend.ts
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/usr/local/src/asymptote-2.85/LspCpp/CMakeFiles --progress-num=$(CMAKE_PROGRESS_7) "Building CXX object third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.o"
- cd /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.o -MF CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.o.d -o CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.o -c /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_normalize.cpp
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --green --progress-dir=/usr/local/src/asymptote-2.87/LspCpp/CMakeFiles --progress-num=$(CMAKE_PROGRESS_7) "Building CXX object third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.o"
+ cd /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.o -MF CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.o.d -o CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.o -c /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_normalize.cpp
third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.i: cmake_force
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.i"
- cd /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_normalize.cpp > CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.i
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --green "Preprocessing CXX source to CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.i"
+ cd /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_normalize.cpp > CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.i
third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.s: cmake_force
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.s"
- cd /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_normalize.cpp -o CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.s
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --green "Compiling CXX source to assembly CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.s"
+ cd /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_normalize.cpp -o CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.s
third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.o: third_party/uri/src/CMakeFiles/network-uri.dir/flags.make
third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.o: third_party/uri/src/detail/uri_resolve.cpp
third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.o: third_party/uri/src/CMakeFiles/network-uri.dir/compiler_depend.ts
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/usr/local/src/asymptote-2.85/LspCpp/CMakeFiles --progress-num=$(CMAKE_PROGRESS_8) "Building CXX object third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.o"
- cd /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.o -MF CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.o.d -o CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.o -c /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_resolve.cpp
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --green --progress-dir=/usr/local/src/asymptote-2.87/LspCpp/CMakeFiles --progress-num=$(CMAKE_PROGRESS_8) "Building CXX object third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.o"
+ cd /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -MD -MT third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.o -MF CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.o.d -o CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.o -c /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_resolve.cpp
third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.i: cmake_force
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.i"
- cd /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_resolve.cpp > CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.i
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --green "Preprocessing CXX source to CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.i"
+ cd /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_resolve.cpp > CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.i
third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.s: cmake_force
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.s"
- cd /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_resolve.cpp -o CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.s
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --green "Compiling CXX source to assembly CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.s"
+ cd /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src && /bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_resolve.cpp -o CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.s
# Object files for target network-uri
network__uri_OBJECTS = \
@@ -208,19 +208,19 @@ third_party/uri/src/libnetwork-uri.a: third_party/uri/src/CMakeFiles/network-uri
third_party/uri/src/libnetwork-uri.a: third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.o
third_party/uri/src/libnetwork-uri.a: third_party/uri/src/CMakeFiles/network-uri.dir/build.make
third_party/uri/src/libnetwork-uri.a: third_party/uri/src/CMakeFiles/network-uri.dir/link.txt
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --bold --progress-dir=/usr/local/src/asymptote-2.85/LspCpp/CMakeFiles --progress-num=$(CMAKE_PROGRESS_9) "Linking CXX static library libnetwork-uri.a"
- cd /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src && $(CMAKE_COMMAND) -P CMakeFiles/network-uri.dir/cmake_clean_target.cmake
- cd /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src && $(CMAKE_COMMAND) -E cmake_link_script CMakeFiles/network-uri.dir/link.txt --verbose=$(VERBOSE)
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --green --bold --progress-dir=/usr/local/src/asymptote-2.87/LspCpp/CMakeFiles --progress-num=$(CMAKE_PROGRESS_9) "Linking CXX static library libnetwork-uri.a"
+ cd /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src && $(CMAKE_COMMAND) -P CMakeFiles/network-uri.dir/cmake_clean_target.cmake
+ cd /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src && $(CMAKE_COMMAND) -E cmake_link_script CMakeFiles/network-uri.dir/link.txt --verbose=$(VERBOSE)
# Rule to build all files generated by this target.
third_party/uri/src/CMakeFiles/network-uri.dir/build: third_party/uri/src/libnetwork-uri.a
.PHONY : third_party/uri/src/CMakeFiles/network-uri.dir/build
third_party/uri/src/CMakeFiles/network-uri.dir/clean:
- cd /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src && $(CMAKE_COMMAND) -P CMakeFiles/network-uri.dir/cmake_clean.cmake
+ cd /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src && $(CMAKE_COMMAND) -P CMakeFiles/network-uri.dir/cmake_clean.cmake
.PHONY : third_party/uri/src/CMakeFiles/network-uri.dir/clean
third_party/uri/src/CMakeFiles/network-uri.dir/depend:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /usr/local/src/asymptote-2.85/LspCpp /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src /usr/local/src/asymptote-2.85/LspCpp /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/DependInfo.cmake --color=$(COLOR)
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /usr/local/src/asymptote-2.87/LspCpp /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src /usr/local/src/asymptote-2.87/LspCpp /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/DependInfo.cmake "--color=$(COLOR)"
.PHONY : third_party/uri/src/CMakeFiles/network-uri.dir/depend
diff --git a/Build/source/utils/asymptote/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/compiler_depend.internal b/Build/source/utils/asymptote/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/compiler_depend.internal
index 15424830422..12acd320c46 100644
--- a/Build/source/utils/asymptote/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/compiler_depend.internal
+++ b/Build/source/utils/asymptote/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/compiler_depend.internal
@@ -1,1723 +1,1724 @@
# CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.25
+# Generated by "Unix Makefiles" Generator, CMake Version 3.27
third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.o
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_advance_parts.cpp
- /usr/include/stdc-predef.h
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_advance_parts.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/detail/uri_parts.hpp
- /usr/include/c++/12/string
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++config.h
- /usr/include/bits/wordsize.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/os_defines.h
- /usr/include/features.h
- /usr/include/features-time64.h
- /usr/include/bits/timesize.h
- /usr/include/sys/cdefs.h
- /usr/include/bits/long-double.h
- /usr/include/gnu/stubs.h
- /usr/include/gnu/stubs-64.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/cpu_defines.h
- /usr/include/c++/12/bits/stringfwd.h
- /usr/include/c++/12/bits/memoryfwd.h
- /usr/include/c++/12/bits/char_traits.h
- /usr/include/c++/12/bits/postypes.h
- /usr/include/c++/12/cwchar
- /usr/include/wchar.h
- /usr/include/bits/libc-header-start.h
- /usr/include/bits/floatn.h
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_advance_parts.cpp
+ /usr/include/alloca.h
+ /usr/include/asm-generic/errno-base.h
+ /usr/include/asm-generic/errno.h
+ /usr/include/asm/errno.h
+ /usr/include/assert.h
+ /usr/include/bits/atomic_wide_counter.h
+ /usr/include/bits/byteswap.h
+ /usr/include/bits/cpu-set.h
+ /usr/include/bits/endian.h
+ /usr/include/bits/endianness.h
+ /usr/include/bits/errno.h
/usr/include/bits/floatn-common.h
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stddef.h
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stdarg.h
- /usr/include/bits/wchar.h
- /usr/include/bits/types/wint_t.h
- /usr/include/bits/types/mbstate_t.h
- /usr/include/bits/types/__mbstate_t.h
- /usr/include/bits/types/__FILE.h
- /usr/include/bits/types/FILE.h
- /usr/include/bits/types/locale_t.h
- /usr/include/bits/types/__locale_t.h
- /usr/include/c++/12/type_traits
- /usr/include/c++/12/cstdint
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stdint.h
- /usr/include/stdint.h
- /usr/include/bits/types.h
- /usr/include/bits/typesizes.h
- /usr/include/bits/time64.h
+ /usr/include/bits/floatn.h
+ /usr/include/bits/libc-header-start.h
+ /usr/include/bits/locale.h
+ /usr/include/bits/long-double.h
+ /usr/include/bits/pthread_stack_min-dynamic.h
+ /usr/include/bits/pthreadtypes-arch.h
+ /usr/include/bits/pthreadtypes.h
+ /usr/include/bits/sched.h
+ /usr/include/bits/select.h
+ /usr/include/bits/setjmp.h
/usr/include/bits/stdint-intn.h
/usr/include/bits/stdint-uintn.h
- /usr/include/c++/12/bits/allocator.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++allocator.h
- /usr/include/c++/12/bits/new_allocator.h
- /usr/include/c++/12/new
- /usr/include/c++/12/bits/exception.h
- /usr/include/c++/12/bits/functexcept.h
- /usr/include/c++/12/bits/exception_defines.h
- /usr/include/c++/12/bits/move.h
- /usr/include/c++/12/bits/cpp_type_traits.h
- /usr/include/c++/12/bits/localefwd.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++locale.h
- /usr/include/c++/12/clocale
- /usr/include/locale.h
- /usr/include/bits/locale.h
- /usr/include/c++/12/iosfwd
- /usr/include/c++/12/cctype
- /usr/include/ctype.h
- /usr/include/bits/endian.h
- /usr/include/bits/endianness.h
- /usr/include/c++/12/bits/ostream_insert.h
- /usr/include/c++/12/bits/cxxabi_forced.h
- /usr/include/c++/12/bits/stl_iterator_base_types.h
- /usr/include/c++/12/bits/stl_iterator_base_funcs.h
- /usr/include/c++/12/bits/concept_check.h
- /usr/include/c++/12/debug/assertions.h
- /usr/include/c++/12/bits/stl_iterator.h
- /usr/include/c++/12/ext/type_traits.h
- /usr/include/c++/12/bits/ptr_traits.h
- /usr/include/c++/12/bits/stl_function.h
- /usr/include/c++/12/backward/binders.h
- /usr/include/c++/12/ext/numeric_traits.h
- /usr/include/c++/12/bits/stl_algobase.h
- /usr/include/c++/12/bits/stl_pair.h
- /usr/include/c++/12/bits/utility.h
- /usr/include/c++/12/debug/debug.h
- /usr/include/c++/12/bits/predefined_ops.h
- /usr/include/c++/12/bits/refwrap.h
- /usr/include/c++/12/bits/invoke.h
- /usr/include/c++/12/bits/range_access.h
- /usr/include/c++/12/initializer_list
- /usr/include/c++/12/bits/basic_string.h
- /usr/include/c++/12/ext/alloc_traits.h
- /usr/include/c++/12/bits/alloc_traits.h
- /usr/include/c++/12/bits/stl_construct.h
- /usr/include/c++/12/ext/string_conversions.h
- /usr/include/c++/12/cstdlib
- /usr/include/stdlib.h
- /usr/include/bits/waitflags.h
- /usr/include/bits/waitstatus.h
- /usr/include/sys/types.h
+ /usr/include/bits/stdio.h
+ /usr/include/bits/stdio_lim.h
+ /usr/include/bits/stdlib-bsearch.h
+ /usr/include/bits/stdlib-float.h
+ /usr/include/bits/struct_mutex.h
+ /usr/include/bits/struct_rwlock.h
+ /usr/include/bits/thread-shared-types.h
+ /usr/include/bits/time.h
+ /usr/include/bits/time64.h
+ /usr/include/bits/timesize.h
+ /usr/include/bits/timex.h
+ /usr/include/bits/types.h
+ /usr/include/bits/types/FILE.h
+ /usr/include/bits/types/__FILE.h
+ /usr/include/bits/types/__fpos64_t.h
+ /usr/include/bits/types/__fpos_t.h
+ /usr/include/bits/types/__locale_t.h
+ /usr/include/bits/types/__mbstate_t.h
+ /usr/include/bits/types/__sigset_t.h
/usr/include/bits/types/clock_t.h
/usr/include/bits/types/clockid_t.h
+ /usr/include/bits/types/cookie_io_functions_t.h
+ /usr/include/bits/types/error_t.h
+ /usr/include/bits/types/locale_t.h
+ /usr/include/bits/types/mbstate_t.h
+ /usr/include/bits/types/sigset_t.h
+ /usr/include/bits/types/struct_FILE.h
+ /usr/include/bits/types/struct___jmp_buf_tag.h
+ /usr/include/bits/types/struct_itimerspec.h
+ /usr/include/bits/types/struct_sched_param.h
+ /usr/include/bits/types/struct_timespec.h
+ /usr/include/bits/types/struct_timeval.h
+ /usr/include/bits/types/struct_tm.h
/usr/include/bits/types/time_t.h
/usr/include/bits/types/timer_t.h
- /usr/include/endian.h
- /usr/include/bits/byteswap.h
+ /usr/include/bits/types/wint_t.h
+ /usr/include/bits/typesizes.h
/usr/include/bits/uintn-identity.h
- /usr/include/sys/select.h
- /usr/include/bits/select.h
- /usr/include/bits/types/sigset_t.h
- /usr/include/bits/types/__sigset_t.h
- /usr/include/bits/types/struct_timeval.h
- /usr/include/bits/types/struct_timespec.h
- /usr/include/bits/pthreadtypes.h
- /usr/include/bits/thread-shared-types.h
- /usr/include/bits/pthreadtypes-arch.h
- /usr/include/bits/atomic_wide_counter.h
- /usr/include/bits/struct_mutex.h
- /usr/include/bits/struct_rwlock.h
- /usr/include/alloca.h
- /usr/include/bits/stdlib-bsearch.h
- /usr/include/bits/stdlib-float.h
- /usr/include/c++/12/bits/std_abs.h
- /usr/include/c++/12/cstdio
- /usr/include/stdio.h
- /usr/include/bits/types/__fpos_t.h
- /usr/include/bits/types/__fpos64_t.h
- /usr/include/bits/types/struct_FILE.h
- /usr/include/bits/types/cookie_io_functions_t.h
- /usr/include/bits/stdio_lim.h
- /usr/include/bits/stdio.h
- /usr/include/c++/12/cerrno
+ /usr/include/bits/waitflags.h
+ /usr/include/bits/waitstatus.h
+ /usr/include/bits/wchar.h
+ /usr/include/bits/wordsize.h
+ /usr/include/c++/13/algorithm
+ /usr/include/c++/13/backward/auto_ptr.h
+ /usr/include/c++/13/backward/binders.h
+ /usr/include/c++/13/bit
+ /usr/include/c++/13/bits/algorithmfwd.h
+ /usr/include/c++/13/bits/align.h
+ /usr/include/c++/13/bits/alloc_traits.h
+ /usr/include/c++/13/bits/allocated_ptr.h
+ /usr/include/c++/13/bits/allocator.h
+ /usr/include/c++/13/bits/atomic_base.h
+ /usr/include/c++/13/bits/atomic_lockfree_defines.h
+ /usr/include/c++/13/bits/basic_string.h
+ /usr/include/c++/13/bits/basic_string.tcc
+ /usr/include/c++/13/bits/char_traits.h
+ /usr/include/c++/13/bits/charconv.h
+ /usr/include/c++/13/bits/concept_check.h
+ /usr/include/c++/13/bits/cpp_type_traits.h
+ /usr/include/c++/13/bits/cxxabi_forced.h
+ /usr/include/c++/13/bits/cxxabi_init_exception.h
+ /usr/include/c++/13/bits/exception.h
+ /usr/include/c++/13/bits/exception_defines.h
+ /usr/include/c++/13/bits/exception_ptr.h
+ /usr/include/c++/13/bits/functexcept.h
+ /usr/include/c++/13/bits/functional_hash.h
+ /usr/include/c++/13/bits/hash_bytes.h
+ /usr/include/c++/13/bits/invoke.h
+ /usr/include/c++/13/bits/ios_base.h
+ /usr/include/c++/13/bits/locale_classes.h
+ /usr/include/c++/13/bits/locale_classes.tcc
+ /usr/include/c++/13/bits/localefwd.h
+ /usr/include/c++/13/bits/memoryfwd.h
+ /usr/include/c++/13/bits/move.h
+ /usr/include/c++/13/bits/nested_exception.h
+ /usr/include/c++/13/bits/new_allocator.h
+ /usr/include/c++/13/bits/ostream_insert.h
+ /usr/include/c++/13/bits/postypes.h
+ /usr/include/c++/13/bits/predefined_ops.h
+ /usr/include/c++/13/bits/ptr_traits.h
+ /usr/include/c++/13/bits/range_access.h
+ /usr/include/c++/13/bits/refwrap.h
+ /usr/include/c++/13/bits/requires_hosted.h
+ /usr/include/c++/13/bits/shared_ptr.h
+ /usr/include/c++/13/bits/shared_ptr_atomic.h
+ /usr/include/c++/13/bits/shared_ptr_base.h
+ /usr/include/c++/13/bits/std_abs.h
+ /usr/include/c++/13/bits/stl_algo.h
+ /usr/include/c++/13/bits/stl_algobase.h
+ /usr/include/c++/13/bits/stl_construct.h
+ /usr/include/c++/13/bits/stl_function.h
+ /usr/include/c++/13/bits/stl_heap.h
+ /usr/include/c++/13/bits/stl_iterator.h
+ /usr/include/c++/13/bits/stl_iterator_base_funcs.h
+ /usr/include/c++/13/bits/stl_iterator_base_types.h
+ /usr/include/c++/13/bits/stl_pair.h
+ /usr/include/c++/13/bits/stl_raw_storage_iter.h
+ /usr/include/c++/13/bits/stl_relops.h
+ /usr/include/c++/13/bits/stl_tempbuf.h
+ /usr/include/c++/13/bits/stl_uninitialized.h
+ /usr/include/c++/13/bits/stream_iterator.h
+ /usr/include/c++/13/bits/streambuf.tcc
+ /usr/include/c++/13/bits/streambuf_iterator.h
+ /usr/include/c++/13/bits/stringfwd.h
+ /usr/include/c++/13/bits/uniform_int_dist.h
+ /usr/include/c++/13/bits/unique_ptr.h
+ /usr/include/c++/13/bits/uses_allocator.h
+ /usr/include/c++/13/bits/utility.h
+ /usr/include/c++/13/cassert
+ /usr/include/c++/13/cctype
+ /usr/include/c++/13/cerrno
+ /usr/include/c++/13/clocale
+ /usr/include/c++/13/cstdio
+ /usr/include/c++/13/cstdlib
+ /usr/include/c++/13/cwchar
+ /usr/include/c++/13/debug/assertions.h
+ /usr/include/c++/13/debug/debug.h
+ /usr/include/c++/13/exception
+ /usr/include/c++/13/ext/aligned_buffer.h
+ /usr/include/c++/13/ext/alloc_traits.h
+ /usr/include/c++/13/ext/atomicity.h
+ /usr/include/c++/13/ext/concurrence.h
+ /usr/include/c++/13/ext/numeric_traits.h
+ /usr/include/c++/13/ext/string_conversions.h
+ /usr/include/c++/13/ext/type_traits.h
+ /usr/include/c++/13/initializer_list
+ /usr/include/c++/13/iosfwd
+ /usr/include/c++/13/iterator
+ /usr/include/c++/13/limits
+ /usr/include/c++/13/memory
+ /usr/include/c++/13/new
+ /usr/include/c++/13/stdexcept
+ /usr/include/c++/13/streambuf
+ /usr/include/c++/13/string
+ /usr/include/c++/13/system_error
+ /usr/include/c++/13/tuple
+ /usr/include/c++/13/type_traits
+ /usr/include/c++/13/typeinfo
+ /usr/include/c++/13/utility
+ /usr/include/c++/13/x86_64-redhat-linux/bits/atomic_word.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++allocator.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++config.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++locale.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/cpu_defines.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/error_constants.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/gthr-default.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/gthr.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/os_defines.h
+ /usr/include/ctype.h
+ /usr/include/endian.h
/usr/include/errno.h
- /usr/include/bits/errno.h
+ /usr/include/features-time64.h
+ /usr/include/features.h
+ /usr/include/gnu/stubs-64.h
+ /usr/include/gnu/stubs.h
/usr/include/linux/errno.h
- /usr/include/asm/errno.h
- /usr/include/asm-generic/errno.h
- /usr/include/asm-generic/errno-base.h
- /usr/include/bits/types/error_t.h
- /usr/include/c++/12/bits/charconv.h
- /usr/include/c++/12/bits/functional_hash.h
- /usr/include/c++/12/bits/hash_bytes.h
- /usr/include/c++/12/bits/basic_string.tcc
- /usr/include/c++/12/utility
- /usr/include/c++/12/bits/stl_relops.h
- /usr/include/c++/12/iterator
- /usr/include/c++/12/bits/stream_iterator.h
- /usr/include/c++/12/bits/streambuf_iterator.h
- /usr/include/c++/12/streambuf
- /usr/include/c++/12/bits/ios_base.h
- /usr/include/c++/12/ext/atomicity.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/gthr.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/gthr-default.h
+ /usr/include/locale.h
/usr/include/pthread.h
/usr/include/sched.h
- /usr/include/bits/sched.h
- /usr/include/bits/types/struct_sched_param.h
- /usr/include/bits/cpu-set.h
- /usr/include/time.h
- /usr/include/bits/time.h
- /usr/include/bits/timex.h
- /usr/include/bits/types/struct_tm.h
- /usr/include/bits/types/struct_itimerspec.h
- /usr/include/bits/setjmp.h
- /usr/include/bits/types/struct___jmp_buf_tag.h
- /usr/include/bits/pthread_stack_min-dynamic.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/atomic_word.h
- /usr/include/sys/single_threaded.h
- /usr/include/c++/12/bits/locale_classes.h
- /usr/include/c++/12/bits/locale_classes.tcc
- /usr/include/c++/12/system_error
- /usr/include/c++/12/x86_64-redhat-linux/bits/error_constants.h
- /usr/include/c++/12/stdexcept
- /usr/include/c++/12/exception
- /usr/include/c++/12/bits/exception_ptr.h
- /usr/include/c++/12/bits/cxxabi_init_exception.h
- /usr/include/c++/12/typeinfo
- /usr/include/c++/12/bits/nested_exception.h
- /usr/include/c++/12/bits/streambuf.tcc
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/optional.hpp
- /usr/include/c++/12/memory
- /usr/include/c++/12/bits/stl_uninitialized.h
- /usr/include/c++/12/bits/stl_tempbuf.h
- /usr/include/c++/12/bits/stl_raw_storage_iter.h
- /usr/include/c++/12/bits/align.h
- /usr/include/c++/12/bit
- /usr/include/c++/12/bits/uses_allocator.h
- /usr/include/c++/12/bits/unique_ptr.h
- /usr/include/c++/12/tuple
- /usr/include/c++/12/bits/shared_ptr.h
- /usr/include/c++/12/bits/shared_ptr_base.h
- /usr/include/c++/12/bits/allocated_ptr.h
- /usr/include/c++/12/ext/aligned_buffer.h
- /usr/include/c++/12/ext/concurrence.h
- /usr/include/c++/12/bits/shared_ptr_atomic.h
- /usr/include/c++/12/bits/atomic_base.h
- /usr/include/c++/12/bits/atomic_lockfree_defines.h
- /usr/include/c++/12/backward/auto_ptr.h
- /usr/include/c++/12/algorithm
- /usr/include/c++/12/bits/stl_algo.h
- /usr/include/c++/12/bits/algorithmfwd.h
- /usr/include/c++/12/bits/stl_heap.h
- /usr/include/c++/12/bits/uniform_int_dist.h
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/string_view.hpp
- /usr/include/c++/12/cassert
- /usr/include/assert.h
- /usr/include/c++/12/limits
-
-third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.o
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_normalize.cpp
/usr/include/stdc-predef.h
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_normalize.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/uri.hpp
- /usr/include/c++/12/iterator
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++config.h
- /usr/include/bits/wordsize.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/os_defines.h
- /usr/include/features.h
- /usr/include/features-time64.h
- /usr/include/bits/timesize.h
+ /usr/include/stdint.h
+ /usr/include/stdio.h
+ /usr/include/stdlib.h
/usr/include/sys/cdefs.h
- /usr/include/bits/long-double.h
- /usr/include/gnu/stubs.h
- /usr/include/gnu/stubs-64.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/cpu_defines.h
- /usr/include/c++/12/bits/stl_iterator_base_types.h
- /usr/include/c++/12/type_traits
- /usr/include/c++/12/bits/stl_iterator_base_funcs.h
- /usr/include/c++/12/bits/concept_check.h
- /usr/include/c++/12/debug/assertions.h
- /usr/include/c++/12/bits/stl_iterator.h
- /usr/include/c++/12/bits/cpp_type_traits.h
- /usr/include/c++/12/ext/type_traits.h
- /usr/include/c++/12/bits/move.h
- /usr/include/c++/12/bits/ptr_traits.h
- /usr/include/c++/12/iosfwd
- /usr/include/c++/12/bits/stringfwd.h
- /usr/include/c++/12/bits/memoryfwd.h
- /usr/include/c++/12/bits/postypes.h
- /usr/include/c++/12/cwchar
+ /usr/include/sys/select.h
+ /usr/include/sys/single_threaded.h
+ /usr/include/sys/types.h
+ /usr/include/time.h
/usr/include/wchar.h
- /usr/include/bits/libc-header-start.h
- /usr/include/bits/floatn.h
- /usr/include/bits/floatn-common.h
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stddef.h
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stdarg.h
- /usr/include/bits/wchar.h
- /usr/include/bits/types/wint_t.h
- /usr/include/bits/types/mbstate_t.h
- /usr/include/bits/types/__mbstate_t.h
- /usr/include/bits/types/__FILE.h
- /usr/include/bits/types/FILE.h
- /usr/include/bits/types/locale_t.h
- /usr/include/bits/types/__locale_t.h
- /usr/include/c++/12/bits/stream_iterator.h
- /usr/include/c++/12/debug/debug.h
- /usr/include/c++/12/bits/streambuf_iterator.h
- /usr/include/c++/12/streambuf
- /usr/include/c++/12/bits/localefwd.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++locale.h
- /usr/include/c++/12/clocale
- /usr/include/locale.h
- /usr/include/bits/locale.h
- /usr/include/c++/12/cctype
- /usr/include/ctype.h
- /usr/include/bits/types.h
- /usr/include/bits/typesizes.h
- /usr/include/bits/time64.h
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stdarg.h
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stddef.h
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stdint.h
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/optional.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/string_view.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/detail/uri_parts.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_advance_parts.hpp
+
+third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.o
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_normalize.cpp
+ /usr/include/alloca.h
+ /usr/include/asm-generic/errno-base.h
+ /usr/include/asm-generic/errno.h
+ /usr/include/asm/errno.h
+ /usr/include/assert.h
+ /usr/include/bits/atomic_wide_counter.h
+ /usr/include/bits/byteswap.h
+ /usr/include/bits/cpu-set.h
/usr/include/bits/endian.h
/usr/include/bits/endianness.h
- /usr/include/c++/12/bits/ios_base.h
- /usr/include/c++/12/ext/atomicity.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/gthr.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/gthr-default.h
- /usr/include/pthread.h
- /usr/include/sched.h
- /usr/include/bits/types/time_t.h
- /usr/include/bits/types/struct_timespec.h
+ /usr/include/bits/errno.h
+ /usr/include/bits/floatn-common.h
+ /usr/include/bits/floatn.h
+ /usr/include/bits/libc-header-start.h
+ /usr/include/bits/locale.h
+ /usr/include/bits/long-double.h
+ /usr/include/bits/pthread_stack_min-dynamic.h
+ /usr/include/bits/pthreadtypes-arch.h
+ /usr/include/bits/pthreadtypes.h
/usr/include/bits/sched.h
- /usr/include/bits/types/struct_sched_param.h
- /usr/include/bits/cpu-set.h
- /usr/include/time.h
+ /usr/include/bits/select.h
+ /usr/include/bits/setjmp.h
+ /usr/include/bits/stdint-intn.h
+ /usr/include/bits/stdint-uintn.h
+ /usr/include/bits/stdio.h
+ /usr/include/bits/stdio_lim.h
+ /usr/include/bits/stdlib-bsearch.h
+ /usr/include/bits/stdlib-float.h
+ /usr/include/bits/struct_mutex.h
+ /usr/include/bits/struct_rwlock.h
+ /usr/include/bits/thread-shared-types.h
/usr/include/bits/time.h
+ /usr/include/bits/time64.h
+ /usr/include/bits/timesize.h
/usr/include/bits/timex.h
- /usr/include/bits/types/struct_timeval.h
+ /usr/include/bits/types.h
+ /usr/include/bits/types/FILE.h
+ /usr/include/bits/types/__FILE.h
+ /usr/include/bits/types/__fpos64_t.h
+ /usr/include/bits/types/__fpos_t.h
+ /usr/include/bits/types/__locale_t.h
+ /usr/include/bits/types/__mbstate_t.h
+ /usr/include/bits/types/__sigset_t.h
/usr/include/bits/types/clock_t.h
- /usr/include/bits/types/struct_tm.h
/usr/include/bits/types/clockid_t.h
- /usr/include/bits/types/timer_t.h
- /usr/include/bits/types/struct_itimerspec.h
- /usr/include/bits/pthreadtypes.h
- /usr/include/bits/thread-shared-types.h
- /usr/include/bits/pthreadtypes-arch.h
- /usr/include/bits/atomic_wide_counter.h
- /usr/include/bits/struct_mutex.h
- /usr/include/bits/struct_rwlock.h
- /usr/include/bits/setjmp.h
- /usr/include/bits/types/__sigset_t.h
+ /usr/include/bits/types/cookie_io_functions_t.h
+ /usr/include/bits/types/error_t.h
+ /usr/include/bits/types/locale_t.h
+ /usr/include/bits/types/mbstate_t.h
+ /usr/include/bits/types/sigset_t.h
+ /usr/include/bits/types/struct_FILE.h
/usr/include/bits/types/struct___jmp_buf_tag.h
- /usr/include/bits/pthread_stack_min-dynamic.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/atomic_word.h
- /usr/include/sys/single_threaded.h
- /usr/include/c++/12/bits/locale_classes.h
- /usr/include/c++/12/string
- /usr/include/c++/12/bits/char_traits.h
- /usr/include/c++/12/cstdint
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stdint.h
- /usr/include/stdint.h
- /usr/include/bits/stdint-intn.h
- /usr/include/bits/stdint-uintn.h
- /usr/include/c++/12/bits/allocator.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++allocator.h
- /usr/include/c++/12/bits/new_allocator.h
- /usr/include/c++/12/new
- /usr/include/c++/12/bits/exception.h
- /usr/include/c++/12/bits/functexcept.h
- /usr/include/c++/12/bits/exception_defines.h
- /usr/include/c++/12/bits/ostream_insert.h
- /usr/include/c++/12/bits/cxxabi_forced.h
- /usr/include/c++/12/bits/stl_function.h
- /usr/include/c++/12/backward/binders.h
- /usr/include/c++/12/ext/numeric_traits.h
- /usr/include/c++/12/bits/stl_algobase.h
- /usr/include/c++/12/bits/stl_pair.h
- /usr/include/c++/12/bits/utility.h
- /usr/include/c++/12/bits/predefined_ops.h
- /usr/include/c++/12/bits/refwrap.h
- /usr/include/c++/12/bits/invoke.h
- /usr/include/c++/12/bits/range_access.h
- /usr/include/c++/12/initializer_list
- /usr/include/c++/12/bits/basic_string.h
- /usr/include/c++/12/ext/alloc_traits.h
- /usr/include/c++/12/bits/alloc_traits.h
- /usr/include/c++/12/bits/stl_construct.h
- /usr/include/c++/12/ext/string_conversions.h
- /usr/include/c++/12/cstdlib
- /usr/include/stdlib.h
+ /usr/include/bits/types/struct_itimerspec.h
+ /usr/include/bits/types/struct_sched_param.h
+ /usr/include/bits/types/struct_timespec.h
+ /usr/include/bits/types/struct_timeval.h
+ /usr/include/bits/types/struct_tm.h
+ /usr/include/bits/types/time_t.h
+ /usr/include/bits/types/timer_t.h
+ /usr/include/bits/types/wint_t.h
+ /usr/include/bits/typesizes.h
+ /usr/include/bits/uintn-identity.h
/usr/include/bits/waitflags.h
/usr/include/bits/waitstatus.h
- /usr/include/sys/types.h
+ /usr/include/bits/wchar.h
+ /usr/include/bits/wctype-wchar.h
+ /usr/include/bits/wordsize.h
+ /usr/include/c++/13/algorithm
+ /usr/include/c++/13/backward/auto_ptr.h
+ /usr/include/c++/13/backward/binders.h
+ /usr/include/c++/13/bit
+ /usr/include/c++/13/bits/algorithmfwd.h
+ /usr/include/c++/13/bits/align.h
+ /usr/include/c++/13/bits/alloc_traits.h
+ /usr/include/c++/13/bits/allocated_ptr.h
+ /usr/include/c++/13/bits/allocator.h
+ /usr/include/c++/13/bits/atomic_base.h
+ /usr/include/c++/13/bits/atomic_lockfree_defines.h
+ /usr/include/c++/13/bits/basic_string.h
+ /usr/include/c++/13/bits/basic_string.tcc
+ /usr/include/c++/13/bits/char_traits.h
+ /usr/include/c++/13/bits/charconv.h
+ /usr/include/c++/13/bits/codecvt.h
+ /usr/include/c++/13/bits/concept_check.h
+ /usr/include/c++/13/bits/cpp_type_traits.h
+ /usr/include/c++/13/bits/cxxabi_forced.h
+ /usr/include/c++/13/bits/cxxabi_init_exception.h
+ /usr/include/c++/13/bits/exception.h
+ /usr/include/c++/13/bits/exception_defines.h
+ /usr/include/c++/13/bits/exception_ptr.h
+ /usr/include/c++/13/bits/functexcept.h
+ /usr/include/c++/13/bits/functional_hash.h
+ /usr/include/c++/13/bits/hash_bytes.h
+ /usr/include/c++/13/bits/invoke.h
+ /usr/include/c++/13/bits/ios_base.h
+ /usr/include/c++/13/bits/locale_classes.h
+ /usr/include/c++/13/bits/locale_classes.tcc
+ /usr/include/c++/13/bits/locale_conv.h
+ /usr/include/c++/13/bits/locale_facets.h
+ /usr/include/c++/13/bits/locale_facets.tcc
+ /usr/include/c++/13/bits/locale_facets_nonio.h
+ /usr/include/c++/13/bits/locale_facets_nonio.tcc
+ /usr/include/c++/13/bits/localefwd.h
+ /usr/include/c++/13/bits/memoryfwd.h
+ /usr/include/c++/13/bits/move.h
+ /usr/include/c++/13/bits/nested_exception.h
+ /usr/include/c++/13/bits/new_allocator.h
+ /usr/include/c++/13/bits/ostream_insert.h
+ /usr/include/c++/13/bits/postypes.h
+ /usr/include/c++/13/bits/predefined_ops.h
+ /usr/include/c++/13/bits/ptr_traits.h
+ /usr/include/c++/13/bits/range_access.h
+ /usr/include/c++/13/bits/refwrap.h
+ /usr/include/c++/13/bits/requires_hosted.h
+ /usr/include/c++/13/bits/shared_ptr.h
+ /usr/include/c++/13/bits/shared_ptr_atomic.h
+ /usr/include/c++/13/bits/shared_ptr_base.h
+ /usr/include/c++/13/bits/std_abs.h
+ /usr/include/c++/13/bits/std_function.h
+ /usr/include/c++/13/bits/stl_algo.h
+ /usr/include/c++/13/bits/stl_algobase.h
+ /usr/include/c++/13/bits/stl_bvector.h
+ /usr/include/c++/13/bits/stl_construct.h
+ /usr/include/c++/13/bits/stl_function.h
+ /usr/include/c++/13/bits/stl_heap.h
+ /usr/include/c++/13/bits/stl_iterator.h
+ /usr/include/c++/13/bits/stl_iterator_base_funcs.h
+ /usr/include/c++/13/bits/stl_iterator_base_types.h
+ /usr/include/c++/13/bits/stl_pair.h
+ /usr/include/c++/13/bits/stl_raw_storage_iter.h
+ /usr/include/c++/13/bits/stl_relops.h
+ /usr/include/c++/13/bits/stl_tempbuf.h
+ /usr/include/c++/13/bits/stl_uninitialized.h
+ /usr/include/c++/13/bits/stl_vector.h
+ /usr/include/c++/13/bits/stream_iterator.h
+ /usr/include/c++/13/bits/streambuf.tcc
+ /usr/include/c++/13/bits/streambuf_iterator.h
+ /usr/include/c++/13/bits/stringfwd.h
+ /usr/include/c++/13/bits/uniform_int_dist.h
+ /usr/include/c++/13/bits/unique_ptr.h
+ /usr/include/c++/13/bits/uses_allocator.h
+ /usr/include/c++/13/bits/utility.h
+ /usr/include/c++/13/bits/vector.tcc
+ /usr/include/c++/13/cassert
+ /usr/include/c++/13/cctype
+ /usr/include/c++/13/cerrno
+ /usr/include/c++/13/clocale
+ /usr/include/c++/13/cstdint
+ /usr/include/c++/13/cstdio
+ /usr/include/c++/13/cstdlib
+ /usr/include/c++/13/cstring
+ /usr/include/c++/13/ctime
+ /usr/include/c++/13/cwchar
+ /usr/include/c++/13/cwctype
+ /usr/include/c++/13/debug/assertions.h
+ /usr/include/c++/13/debug/debug.h
+ /usr/include/c++/13/exception
+ /usr/include/c++/13/ext/aligned_buffer.h
+ /usr/include/c++/13/ext/alloc_traits.h
+ /usr/include/c++/13/ext/atomicity.h
+ /usr/include/c++/13/ext/concurrence.h
+ /usr/include/c++/13/ext/numeric_traits.h
+ /usr/include/c++/13/ext/string_conversions.h
+ /usr/include/c++/13/ext/type_traits.h
+ /usr/include/c++/13/functional
+ /usr/include/c++/13/initializer_list
+ /usr/include/c++/13/iosfwd
+ /usr/include/c++/13/iterator
+ /usr/include/c++/13/locale
+ /usr/include/c++/13/memory
+ /usr/include/c++/13/new
+ /usr/include/c++/13/stdexcept
+ /usr/include/c++/13/streambuf
+ /usr/include/c++/13/string
+ /usr/include/c++/13/system_error
+ /usr/include/c++/13/tuple
+ /usr/include/c++/13/type_traits
+ /usr/include/c++/13/typeinfo
+ /usr/include/c++/13/utility
+ /usr/include/c++/13/vector
+ /usr/include/c++/13/x86_64-redhat-linux/bits/atomic_word.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++allocator.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++config.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++locale.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/cpu_defines.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/ctype_base.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/ctype_inline.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/error_constants.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/gthr-default.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/gthr.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/messages_members.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/os_defines.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/time_members.h
+ /usr/include/ctype.h
/usr/include/endian.h
- /usr/include/bits/byteswap.h
- /usr/include/bits/uintn-identity.h
- /usr/include/sys/select.h
- /usr/include/bits/select.h
- /usr/include/bits/types/sigset_t.h
- /usr/include/alloca.h
- /usr/include/bits/stdlib-bsearch.h
- /usr/include/bits/stdlib-float.h
- /usr/include/c++/12/bits/std_abs.h
- /usr/include/c++/12/cstdio
- /usr/include/stdio.h
- /usr/include/bits/types/__fpos_t.h
- /usr/include/bits/types/__fpos64_t.h
- /usr/include/bits/types/struct_FILE.h
- /usr/include/bits/types/cookie_io_functions_t.h
- /usr/include/bits/stdio_lim.h
- /usr/include/bits/stdio.h
- /usr/include/c++/12/cerrno
/usr/include/errno.h
- /usr/include/bits/errno.h
+ /usr/include/features-time64.h
+ /usr/include/features.h
+ /usr/include/gnu/stubs-64.h
+ /usr/include/gnu/stubs.h
+ /usr/include/libintl.h
/usr/include/linux/errno.h
- /usr/include/asm/errno.h
- /usr/include/asm-generic/errno.h
- /usr/include/asm-generic/errno-base.h
- /usr/include/bits/types/error_t.h
- /usr/include/c++/12/bits/charconv.h
- /usr/include/c++/12/bits/functional_hash.h
- /usr/include/c++/12/bits/hash_bytes.h
- /usr/include/c++/12/bits/basic_string.tcc
- /usr/include/c++/12/bits/locale_classes.tcc
- /usr/include/c++/12/system_error
- /usr/include/c++/12/x86_64-redhat-linux/bits/error_constants.h
- /usr/include/c++/12/stdexcept
- /usr/include/c++/12/exception
- /usr/include/c++/12/bits/exception_ptr.h
- /usr/include/c++/12/bits/cxxabi_init_exception.h
- /usr/include/c++/12/typeinfo
- /usr/include/c++/12/bits/nested_exception.h
- /usr/include/c++/12/bits/streambuf.tcc
- /usr/include/c++/12/algorithm
- /usr/include/c++/12/bits/stl_algo.h
- /usr/include/c++/12/bits/algorithmfwd.h
- /usr/include/c++/12/bits/stl_heap.h
- /usr/include/c++/12/bits/stl_tempbuf.h
- /usr/include/c++/12/bits/uniform_int_dist.h
- /usr/include/c++/12/functional
- /usr/include/c++/12/tuple
- /usr/include/c++/12/bits/uses_allocator.h
- /usr/include/c++/12/bits/std_function.h
- /usr/include/c++/12/memory
- /usr/include/c++/12/bits/stl_uninitialized.h
- /usr/include/c++/12/bits/stl_raw_storage_iter.h
- /usr/include/c++/12/bits/align.h
- /usr/include/c++/12/bit
- /usr/include/c++/12/bits/unique_ptr.h
- /usr/include/c++/12/bits/shared_ptr.h
- /usr/include/c++/12/bits/shared_ptr_base.h
- /usr/include/c++/12/bits/allocated_ptr.h
- /usr/include/c++/12/ext/aligned_buffer.h
- /usr/include/c++/12/ext/concurrence.h
- /usr/include/c++/12/bits/shared_ptr_atomic.h
- /usr/include/c++/12/bits/atomic_base.h
- /usr/include/c++/12/bits/atomic_lockfree_defines.h
- /usr/include/c++/12/backward/auto_ptr.h
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/string_view.hpp
- /usr/include/c++/12/cassert
- /usr/include/assert.h
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/optional.hpp
- /usr/include/c++/12/utility
- /usr/include/c++/12/bits/stl_relops.h
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/config.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/uri_errors.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/detail/uri_parts.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/detail/encode.hpp
- /usr/include/c++/12/cstring
+ /usr/include/locale.h
+ /usr/include/pthread.h
+ /usr/include/sched.h
+ /usr/include/stdc-predef.h
+ /usr/include/stdint.h
+ /usr/include/stdio.h
+ /usr/include/stdlib.h
/usr/include/string.h
/usr/include/strings.h
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/detail/decode.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/detail/translate.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/uri_builder.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_percent_encode.hpp
- /usr/include/c++/12/vector
- /usr/include/c++/12/bits/stl_vector.h
- /usr/include/c++/12/bits/stl_bvector.h
- /usr/include/c++/12/bits/vector.tcc
- /usr/include/c++/12/locale
- /usr/include/c++/12/bits/locale_facets.h
- /usr/include/c++/12/cwctype
+ /usr/include/sys/cdefs.h
+ /usr/include/sys/select.h
+ /usr/include/sys/single_threaded.h
+ /usr/include/sys/types.h
+ /usr/include/time.h
+ /usr/include/wchar.h
/usr/include/wctype.h
- /usr/include/bits/wctype-wchar.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/ctype_base.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/ctype_inline.h
- /usr/include/c++/12/bits/locale_facets.tcc
- /usr/include/c++/12/bits/locale_facets_nonio.h
- /usr/include/c++/12/ctime
- /usr/include/c++/12/x86_64-redhat-linux/bits/time_members.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/messages_members.h
- /usr/include/libintl.h
- /usr/include/c++/12/bits/codecvt.h
- /usr/include/c++/12/bits/locale_facets_nonio.tcc
- /usr/include/c++/12/bits/locale_conv.h
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/algorithm.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/algorithm_split.hpp
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stdarg.h
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stddef.h
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stdint.h
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/optional.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/string_view.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/config.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/detail/decode.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/detail/encode.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/detail/translate.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/detail/uri_parts.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/uri.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/uri_builder.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/uri_errors.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/algorithm.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/algorithm_split.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_normalize.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_percent_encode.hpp
third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse.cpp.o
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_parse.cpp
- /usr/include/stdc-predef.h
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_parse.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/string_view.hpp
- /usr/include/c++/12/string
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++config.h
- /usr/include/bits/wordsize.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/os_defines.h
- /usr/include/features.h
- /usr/include/features-time64.h
- /usr/include/bits/timesize.h
- /usr/include/sys/cdefs.h
- /usr/include/bits/long-double.h
- /usr/include/gnu/stubs.h
- /usr/include/gnu/stubs-64.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/cpu_defines.h
- /usr/include/c++/12/bits/stringfwd.h
- /usr/include/c++/12/bits/memoryfwd.h
- /usr/include/c++/12/bits/char_traits.h
- /usr/include/c++/12/bits/postypes.h
- /usr/include/c++/12/cwchar
- /usr/include/wchar.h
- /usr/include/bits/libc-header-start.h
- /usr/include/bits/floatn.h
- /usr/include/bits/floatn-common.h
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stddef.h
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stdarg.h
- /usr/include/bits/wchar.h
- /usr/include/bits/types/wint_t.h
- /usr/include/bits/types/mbstate_t.h
- /usr/include/bits/types/__mbstate_t.h
- /usr/include/bits/types/__FILE.h
- /usr/include/bits/types/FILE.h
- /usr/include/bits/types/locale_t.h
- /usr/include/bits/types/__locale_t.h
- /usr/include/c++/12/type_traits
- /usr/include/c++/12/cstdint
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stdint.h
- /usr/include/stdint.h
- /usr/include/bits/types.h
- /usr/include/bits/typesizes.h
- /usr/include/bits/time64.h
- /usr/include/bits/stdint-intn.h
- /usr/include/bits/stdint-uintn.h
- /usr/include/c++/12/bits/allocator.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++allocator.h
- /usr/include/c++/12/bits/new_allocator.h
- /usr/include/c++/12/new
- /usr/include/c++/12/bits/exception.h
- /usr/include/c++/12/bits/functexcept.h
- /usr/include/c++/12/bits/exception_defines.h
- /usr/include/c++/12/bits/move.h
- /usr/include/c++/12/bits/cpp_type_traits.h
- /usr/include/c++/12/bits/localefwd.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++locale.h
- /usr/include/c++/12/clocale
- /usr/include/locale.h
- /usr/include/bits/locale.h
- /usr/include/c++/12/iosfwd
- /usr/include/c++/12/cctype
- /usr/include/ctype.h
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_parse.cpp
+ /usr/include/alloca.h
+ /usr/include/asm-generic/errno-base.h
+ /usr/include/asm-generic/errno.h
+ /usr/include/asm/errno.h
+ /usr/include/assert.h
+ /usr/include/bits/atomic_wide_counter.h
+ /usr/include/bits/byteswap.h
+ /usr/include/bits/cpu-set.h
/usr/include/bits/endian.h
/usr/include/bits/endianness.h
- /usr/include/c++/12/bits/ostream_insert.h
- /usr/include/c++/12/bits/cxxabi_forced.h
- /usr/include/c++/12/bits/stl_iterator_base_types.h
- /usr/include/c++/12/bits/stl_iterator_base_funcs.h
- /usr/include/c++/12/bits/concept_check.h
- /usr/include/c++/12/debug/assertions.h
- /usr/include/c++/12/bits/stl_iterator.h
- /usr/include/c++/12/ext/type_traits.h
- /usr/include/c++/12/bits/ptr_traits.h
- /usr/include/c++/12/bits/stl_function.h
- /usr/include/c++/12/backward/binders.h
- /usr/include/c++/12/ext/numeric_traits.h
- /usr/include/c++/12/bits/stl_algobase.h
- /usr/include/c++/12/bits/stl_pair.h
- /usr/include/c++/12/bits/utility.h
- /usr/include/c++/12/debug/debug.h
- /usr/include/c++/12/bits/predefined_ops.h
- /usr/include/c++/12/bits/refwrap.h
- /usr/include/c++/12/bits/invoke.h
- /usr/include/c++/12/bits/range_access.h
- /usr/include/c++/12/initializer_list
- /usr/include/c++/12/bits/basic_string.h
- /usr/include/c++/12/ext/alloc_traits.h
- /usr/include/c++/12/bits/alloc_traits.h
- /usr/include/c++/12/bits/stl_construct.h
- /usr/include/c++/12/ext/string_conversions.h
- /usr/include/c++/12/cstdlib
- /usr/include/stdlib.h
- /usr/include/bits/waitflags.h
- /usr/include/bits/waitstatus.h
- /usr/include/sys/types.h
- /usr/include/bits/types/clock_t.h
- /usr/include/bits/types/clockid_t.h
- /usr/include/bits/types/time_t.h
- /usr/include/bits/types/timer_t.h
- /usr/include/endian.h
- /usr/include/bits/byteswap.h
- /usr/include/bits/uintn-identity.h
- /usr/include/sys/select.h
- /usr/include/bits/select.h
- /usr/include/bits/types/sigset_t.h
- /usr/include/bits/types/__sigset_t.h
- /usr/include/bits/types/struct_timeval.h
- /usr/include/bits/types/struct_timespec.h
- /usr/include/bits/pthreadtypes.h
- /usr/include/bits/thread-shared-types.h
+ /usr/include/bits/errno.h
+ /usr/include/bits/floatn-common.h
+ /usr/include/bits/floatn.h
+ /usr/include/bits/libc-header-start.h
+ /usr/include/bits/locale.h
+ /usr/include/bits/long-double.h
+ /usr/include/bits/pthread_stack_min-dynamic.h
/usr/include/bits/pthreadtypes-arch.h
- /usr/include/bits/atomic_wide_counter.h
- /usr/include/bits/struct_mutex.h
- /usr/include/bits/struct_rwlock.h
- /usr/include/alloca.h
+ /usr/include/bits/pthreadtypes.h
+ /usr/include/bits/sched.h
+ /usr/include/bits/select.h
+ /usr/include/bits/setjmp.h
+ /usr/include/bits/stdint-intn.h
+ /usr/include/bits/stdint-uintn.h
+ /usr/include/bits/stdio.h
+ /usr/include/bits/stdio_lim.h
/usr/include/bits/stdlib-bsearch.h
/usr/include/bits/stdlib-float.h
- /usr/include/c++/12/bits/std_abs.h
- /usr/include/c++/12/cstdio
- /usr/include/stdio.h
- /usr/include/bits/types/__fpos_t.h
+ /usr/include/bits/struct_mutex.h
+ /usr/include/bits/struct_rwlock.h
+ /usr/include/bits/thread-shared-types.h
+ /usr/include/bits/time.h
+ /usr/include/bits/time64.h
+ /usr/include/bits/timesize.h
+ /usr/include/bits/timex.h
+ /usr/include/bits/types.h
+ /usr/include/bits/types/FILE.h
+ /usr/include/bits/types/__FILE.h
/usr/include/bits/types/__fpos64_t.h
- /usr/include/bits/types/struct_FILE.h
+ /usr/include/bits/types/__fpos_t.h
+ /usr/include/bits/types/__locale_t.h
+ /usr/include/bits/types/__mbstate_t.h
+ /usr/include/bits/types/__sigset_t.h
+ /usr/include/bits/types/clock_t.h
+ /usr/include/bits/types/clockid_t.h
/usr/include/bits/types/cookie_io_functions_t.h
- /usr/include/bits/stdio_lim.h
- /usr/include/bits/stdio.h
- /usr/include/c++/12/cerrno
- /usr/include/errno.h
- /usr/include/bits/errno.h
- /usr/include/linux/errno.h
- /usr/include/asm/errno.h
- /usr/include/asm-generic/errno.h
- /usr/include/asm-generic/errno-base.h
/usr/include/bits/types/error_t.h
- /usr/include/c++/12/bits/charconv.h
- /usr/include/c++/12/bits/functional_hash.h
- /usr/include/c++/12/bits/hash_bytes.h
- /usr/include/c++/12/bits/basic_string.tcc
- /usr/include/c++/12/iterator
- /usr/include/c++/12/bits/stream_iterator.h
- /usr/include/c++/12/bits/streambuf_iterator.h
- /usr/include/c++/12/streambuf
- /usr/include/c++/12/bits/ios_base.h
- /usr/include/c++/12/ext/atomicity.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/gthr.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/gthr-default.h
- /usr/include/pthread.h
- /usr/include/sched.h
- /usr/include/bits/sched.h
+ /usr/include/bits/types/locale_t.h
+ /usr/include/bits/types/mbstate_t.h
+ /usr/include/bits/types/sigset_t.h
+ /usr/include/bits/types/struct_FILE.h
+ /usr/include/bits/types/struct___jmp_buf_tag.h
+ /usr/include/bits/types/struct_itimerspec.h
/usr/include/bits/types/struct_sched_param.h
- /usr/include/bits/cpu-set.h
- /usr/include/time.h
- /usr/include/bits/time.h
- /usr/include/bits/timex.h
+ /usr/include/bits/types/struct_timespec.h
+ /usr/include/bits/types/struct_timeval.h
/usr/include/bits/types/struct_tm.h
- /usr/include/bits/types/struct_itimerspec.h
- /usr/include/bits/setjmp.h
- /usr/include/bits/types/struct___jmp_buf_tag.h
- /usr/include/bits/pthread_stack_min-dynamic.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/atomic_word.h
- /usr/include/sys/single_threaded.h
- /usr/include/c++/12/bits/locale_classes.h
- /usr/include/c++/12/bits/locale_classes.tcc
- /usr/include/c++/12/system_error
- /usr/include/c++/12/x86_64-redhat-linux/bits/error_constants.h
- /usr/include/c++/12/stdexcept
- /usr/include/c++/12/exception
- /usr/include/c++/12/bits/exception_ptr.h
- /usr/include/c++/12/bits/cxxabi_init_exception.h
- /usr/include/c++/12/typeinfo
- /usr/include/c++/12/bits/nested_exception.h
- /usr/include/c++/12/bits/streambuf.tcc
- /usr/include/c++/12/cassert
- /usr/include/assert.h
- /usr/include/c++/12/algorithm
- /usr/include/c++/12/bits/stl_algo.h
- /usr/include/c++/12/bits/algorithmfwd.h
- /usr/include/c++/12/bits/stl_heap.h
- /usr/include/c++/12/bits/stl_tempbuf.h
- /usr/include/c++/12/bits/uniform_int_dist.h
- /usr/include/c++/12/limits
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/grammar.hpp
- /usr/include/c++/12/locale
- /usr/include/c++/12/bits/locale_facets.h
- /usr/include/c++/12/cwctype
- /usr/include/wctype.h
+ /usr/include/bits/types/time_t.h
+ /usr/include/bits/types/timer_t.h
+ /usr/include/bits/types/wint_t.h
+ /usr/include/bits/typesizes.h
+ /usr/include/bits/uintn-identity.h
+ /usr/include/bits/waitflags.h
+ /usr/include/bits/waitstatus.h
+ /usr/include/bits/wchar.h
/usr/include/bits/wctype-wchar.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/ctype_base.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/ctype_inline.h
- /usr/include/c++/12/bits/locale_facets.tcc
- /usr/include/c++/12/bits/locale_facets_nonio.h
- /usr/include/c++/12/ctime
- /usr/include/c++/12/x86_64-redhat-linux/bits/time_members.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/messages_members.h
- /usr/include/libintl.h
- /usr/include/c++/12/bits/codecvt.h
- /usr/include/c++/12/bits/locale_facets_nonio.tcc
- /usr/include/c++/12/bits/locale_conv.h
- /usr/include/c++/12/cstring
- /usr/include/string.h
- /usr/include/strings.h
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/detail/uri_parts.hpp
- /usr/include/c++/12/utility
- /usr/include/c++/12/bits/stl_relops.h
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/optional.hpp
- /usr/include/c++/12/memory
- /usr/include/c++/12/bits/stl_uninitialized.h
- /usr/include/c++/12/bits/stl_raw_storage_iter.h
- /usr/include/c++/12/bits/align.h
- /usr/include/c++/12/bit
- /usr/include/c++/12/bits/uses_allocator.h
- /usr/include/c++/12/bits/unique_ptr.h
- /usr/include/c++/12/tuple
- /usr/include/c++/12/bits/shared_ptr.h
- /usr/include/c++/12/bits/shared_ptr_base.h
- /usr/include/c++/12/bits/allocated_ptr.h
- /usr/include/c++/12/ext/aligned_buffer.h
- /usr/include/c++/12/ext/concurrence.h
- /usr/include/c++/12/bits/shared_ptr_atomic.h
- /usr/include/c++/12/bits/atomic_base.h
- /usr/include/c++/12/bits/atomic_lockfree_defines.h
- /usr/include/c++/12/backward/auto_ptr.h
-
-third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.o
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_parse_authority.cpp
- /usr/include/stdc-predef.h
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_parse_authority.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/detail/uri_parts.hpp
- /usr/include/c++/12/string
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++config.h
/usr/include/bits/wordsize.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/os_defines.h
- /usr/include/features.h
+ /usr/include/c++/13/algorithm
+ /usr/include/c++/13/backward/auto_ptr.h
+ /usr/include/c++/13/backward/binders.h
+ /usr/include/c++/13/bit
+ /usr/include/c++/13/bits/algorithmfwd.h
+ /usr/include/c++/13/bits/align.h
+ /usr/include/c++/13/bits/alloc_traits.h
+ /usr/include/c++/13/bits/allocated_ptr.h
+ /usr/include/c++/13/bits/allocator.h
+ /usr/include/c++/13/bits/atomic_base.h
+ /usr/include/c++/13/bits/atomic_lockfree_defines.h
+ /usr/include/c++/13/bits/basic_string.h
+ /usr/include/c++/13/bits/basic_string.tcc
+ /usr/include/c++/13/bits/char_traits.h
+ /usr/include/c++/13/bits/charconv.h
+ /usr/include/c++/13/bits/codecvt.h
+ /usr/include/c++/13/bits/concept_check.h
+ /usr/include/c++/13/bits/cpp_type_traits.h
+ /usr/include/c++/13/bits/cxxabi_forced.h
+ /usr/include/c++/13/bits/cxxabi_init_exception.h
+ /usr/include/c++/13/bits/exception.h
+ /usr/include/c++/13/bits/exception_defines.h
+ /usr/include/c++/13/bits/exception_ptr.h
+ /usr/include/c++/13/bits/functexcept.h
+ /usr/include/c++/13/bits/functional_hash.h
+ /usr/include/c++/13/bits/hash_bytes.h
+ /usr/include/c++/13/bits/invoke.h
+ /usr/include/c++/13/bits/ios_base.h
+ /usr/include/c++/13/bits/locale_classes.h
+ /usr/include/c++/13/bits/locale_classes.tcc
+ /usr/include/c++/13/bits/locale_conv.h
+ /usr/include/c++/13/bits/locale_facets.h
+ /usr/include/c++/13/bits/locale_facets.tcc
+ /usr/include/c++/13/bits/locale_facets_nonio.h
+ /usr/include/c++/13/bits/locale_facets_nonio.tcc
+ /usr/include/c++/13/bits/localefwd.h
+ /usr/include/c++/13/bits/memoryfwd.h
+ /usr/include/c++/13/bits/move.h
+ /usr/include/c++/13/bits/nested_exception.h
+ /usr/include/c++/13/bits/new_allocator.h
+ /usr/include/c++/13/bits/ostream_insert.h
+ /usr/include/c++/13/bits/postypes.h
+ /usr/include/c++/13/bits/predefined_ops.h
+ /usr/include/c++/13/bits/ptr_traits.h
+ /usr/include/c++/13/bits/range_access.h
+ /usr/include/c++/13/bits/refwrap.h
+ /usr/include/c++/13/bits/requires_hosted.h
+ /usr/include/c++/13/bits/shared_ptr.h
+ /usr/include/c++/13/bits/shared_ptr_atomic.h
+ /usr/include/c++/13/bits/shared_ptr_base.h
+ /usr/include/c++/13/bits/std_abs.h
+ /usr/include/c++/13/bits/stl_algo.h
+ /usr/include/c++/13/bits/stl_algobase.h
+ /usr/include/c++/13/bits/stl_construct.h
+ /usr/include/c++/13/bits/stl_function.h
+ /usr/include/c++/13/bits/stl_heap.h
+ /usr/include/c++/13/bits/stl_iterator.h
+ /usr/include/c++/13/bits/stl_iterator_base_funcs.h
+ /usr/include/c++/13/bits/stl_iterator_base_types.h
+ /usr/include/c++/13/bits/stl_pair.h
+ /usr/include/c++/13/bits/stl_raw_storage_iter.h
+ /usr/include/c++/13/bits/stl_relops.h
+ /usr/include/c++/13/bits/stl_tempbuf.h
+ /usr/include/c++/13/bits/stl_uninitialized.h
+ /usr/include/c++/13/bits/stream_iterator.h
+ /usr/include/c++/13/bits/streambuf.tcc
+ /usr/include/c++/13/bits/streambuf_iterator.h
+ /usr/include/c++/13/bits/stringfwd.h
+ /usr/include/c++/13/bits/uniform_int_dist.h
+ /usr/include/c++/13/bits/unique_ptr.h
+ /usr/include/c++/13/bits/uses_allocator.h
+ /usr/include/c++/13/bits/utility.h
+ /usr/include/c++/13/cassert
+ /usr/include/c++/13/cctype
+ /usr/include/c++/13/cerrno
+ /usr/include/c++/13/clocale
+ /usr/include/c++/13/cstdio
+ /usr/include/c++/13/cstdlib
+ /usr/include/c++/13/cstring
+ /usr/include/c++/13/ctime
+ /usr/include/c++/13/cwchar
+ /usr/include/c++/13/cwctype
+ /usr/include/c++/13/debug/assertions.h
+ /usr/include/c++/13/debug/debug.h
+ /usr/include/c++/13/exception
+ /usr/include/c++/13/ext/aligned_buffer.h
+ /usr/include/c++/13/ext/alloc_traits.h
+ /usr/include/c++/13/ext/atomicity.h
+ /usr/include/c++/13/ext/concurrence.h
+ /usr/include/c++/13/ext/numeric_traits.h
+ /usr/include/c++/13/ext/string_conversions.h
+ /usr/include/c++/13/ext/type_traits.h
+ /usr/include/c++/13/initializer_list
+ /usr/include/c++/13/iosfwd
+ /usr/include/c++/13/iterator
+ /usr/include/c++/13/limits
+ /usr/include/c++/13/locale
+ /usr/include/c++/13/memory
+ /usr/include/c++/13/new
+ /usr/include/c++/13/stdexcept
+ /usr/include/c++/13/streambuf
+ /usr/include/c++/13/string
+ /usr/include/c++/13/system_error
+ /usr/include/c++/13/tuple
+ /usr/include/c++/13/type_traits
+ /usr/include/c++/13/typeinfo
+ /usr/include/c++/13/utility
+ /usr/include/c++/13/x86_64-redhat-linux/bits/atomic_word.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++allocator.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++config.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++locale.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/cpu_defines.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/ctype_base.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/ctype_inline.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/error_constants.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/gthr-default.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/gthr.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/messages_members.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/os_defines.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/time_members.h
+ /usr/include/ctype.h
+ /usr/include/endian.h
+ /usr/include/errno.h
/usr/include/features-time64.h
- /usr/include/bits/timesize.h
- /usr/include/sys/cdefs.h
- /usr/include/bits/long-double.h
- /usr/include/gnu/stubs.h
+ /usr/include/features.h
/usr/include/gnu/stubs-64.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/cpu_defines.h
- /usr/include/c++/12/bits/stringfwd.h
- /usr/include/c++/12/bits/memoryfwd.h
- /usr/include/c++/12/bits/char_traits.h
- /usr/include/c++/12/bits/postypes.h
- /usr/include/c++/12/cwchar
- /usr/include/wchar.h
- /usr/include/bits/libc-header-start.h
- /usr/include/bits/floatn.h
- /usr/include/bits/floatn-common.h
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stddef.h
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stdarg.h
- /usr/include/bits/wchar.h
- /usr/include/bits/types/wint_t.h
- /usr/include/bits/types/mbstate_t.h
- /usr/include/bits/types/__mbstate_t.h
- /usr/include/bits/types/__FILE.h
- /usr/include/bits/types/FILE.h
- /usr/include/bits/types/locale_t.h
- /usr/include/bits/types/__locale_t.h
- /usr/include/c++/12/type_traits
- /usr/include/c++/12/cstdint
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stdint.h
- /usr/include/stdint.h
- /usr/include/bits/types.h
- /usr/include/bits/typesizes.h
- /usr/include/bits/time64.h
- /usr/include/bits/stdint-intn.h
- /usr/include/bits/stdint-uintn.h
- /usr/include/c++/12/bits/allocator.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++allocator.h
- /usr/include/c++/12/bits/new_allocator.h
- /usr/include/c++/12/new
- /usr/include/c++/12/bits/exception.h
- /usr/include/c++/12/bits/functexcept.h
- /usr/include/c++/12/bits/exception_defines.h
- /usr/include/c++/12/bits/move.h
- /usr/include/c++/12/bits/cpp_type_traits.h
- /usr/include/c++/12/bits/localefwd.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++locale.h
- /usr/include/c++/12/clocale
+ /usr/include/gnu/stubs.h
+ /usr/include/libintl.h
+ /usr/include/linux/errno.h
/usr/include/locale.h
- /usr/include/bits/locale.h
- /usr/include/c++/12/iosfwd
- /usr/include/c++/12/cctype
- /usr/include/ctype.h
- /usr/include/bits/endian.h
- /usr/include/bits/endianness.h
- /usr/include/c++/12/bits/ostream_insert.h
- /usr/include/c++/12/bits/cxxabi_forced.h
- /usr/include/c++/12/bits/stl_iterator_base_types.h
- /usr/include/c++/12/bits/stl_iterator_base_funcs.h
- /usr/include/c++/12/bits/concept_check.h
- /usr/include/c++/12/debug/assertions.h
- /usr/include/c++/12/bits/stl_iterator.h
- /usr/include/c++/12/ext/type_traits.h
- /usr/include/c++/12/bits/ptr_traits.h
- /usr/include/c++/12/bits/stl_function.h
- /usr/include/c++/12/backward/binders.h
- /usr/include/c++/12/ext/numeric_traits.h
- /usr/include/c++/12/bits/stl_algobase.h
- /usr/include/c++/12/bits/stl_pair.h
- /usr/include/c++/12/bits/utility.h
- /usr/include/c++/12/debug/debug.h
- /usr/include/c++/12/bits/predefined_ops.h
- /usr/include/c++/12/bits/refwrap.h
- /usr/include/c++/12/bits/invoke.h
- /usr/include/c++/12/bits/range_access.h
- /usr/include/c++/12/initializer_list
- /usr/include/c++/12/bits/basic_string.h
- /usr/include/c++/12/ext/alloc_traits.h
- /usr/include/c++/12/bits/alloc_traits.h
- /usr/include/c++/12/bits/stl_construct.h
- /usr/include/c++/12/ext/string_conversions.h
- /usr/include/c++/12/cstdlib
+ /usr/include/pthread.h
+ /usr/include/sched.h
+ /usr/include/stdc-predef.h
+ /usr/include/stdint.h
+ /usr/include/stdio.h
/usr/include/stdlib.h
- /usr/include/bits/waitflags.h
- /usr/include/bits/waitstatus.h
+ /usr/include/string.h
+ /usr/include/strings.h
+ /usr/include/sys/cdefs.h
+ /usr/include/sys/select.h
+ /usr/include/sys/single_threaded.h
/usr/include/sys/types.h
- /usr/include/bits/types/clock_t.h
- /usr/include/bits/types/clockid_t.h
- /usr/include/bits/types/time_t.h
- /usr/include/bits/types/timer_t.h
- /usr/include/endian.h
+ /usr/include/time.h
+ /usr/include/wchar.h
+ /usr/include/wctype.h
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stdarg.h
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stddef.h
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stdint.h
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/optional.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/string_view.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/detail/uri_parts.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/grammar.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_parse.hpp
+
+third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.o
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_parse_authority.cpp
+ /usr/include/alloca.h
+ /usr/include/asm-generic/errno-base.h
+ /usr/include/asm-generic/errno.h
+ /usr/include/asm/errno.h
+ /usr/include/assert.h
+ /usr/include/bits/atomic_wide_counter.h
/usr/include/bits/byteswap.h
- /usr/include/bits/uintn-identity.h
- /usr/include/sys/select.h
- /usr/include/bits/select.h
- /usr/include/bits/types/sigset_t.h
- /usr/include/bits/types/__sigset_t.h
- /usr/include/bits/types/struct_timeval.h
- /usr/include/bits/types/struct_timespec.h
- /usr/include/bits/pthreadtypes.h
- /usr/include/bits/thread-shared-types.h
+ /usr/include/bits/cpu-set.h
+ /usr/include/bits/endian.h
+ /usr/include/bits/endianness.h
+ /usr/include/bits/errno.h
+ /usr/include/bits/floatn-common.h
+ /usr/include/bits/floatn.h
+ /usr/include/bits/libc-header-start.h
+ /usr/include/bits/locale.h
+ /usr/include/bits/long-double.h
+ /usr/include/bits/pthread_stack_min-dynamic.h
/usr/include/bits/pthreadtypes-arch.h
- /usr/include/bits/atomic_wide_counter.h
- /usr/include/bits/struct_mutex.h
- /usr/include/bits/struct_rwlock.h
- /usr/include/alloca.h
+ /usr/include/bits/pthreadtypes.h
+ /usr/include/bits/sched.h
+ /usr/include/bits/select.h
+ /usr/include/bits/setjmp.h
+ /usr/include/bits/stdint-intn.h
+ /usr/include/bits/stdint-uintn.h
+ /usr/include/bits/stdio.h
+ /usr/include/bits/stdio_lim.h
/usr/include/bits/stdlib-bsearch.h
/usr/include/bits/stdlib-float.h
- /usr/include/c++/12/bits/std_abs.h
- /usr/include/c++/12/cstdio
- /usr/include/stdio.h
- /usr/include/bits/types/__fpos_t.h
+ /usr/include/bits/struct_mutex.h
+ /usr/include/bits/struct_rwlock.h
+ /usr/include/bits/thread-shared-types.h
+ /usr/include/bits/time.h
+ /usr/include/bits/time64.h
+ /usr/include/bits/timesize.h
+ /usr/include/bits/timex.h
+ /usr/include/bits/types.h
+ /usr/include/bits/types/FILE.h
+ /usr/include/bits/types/__FILE.h
/usr/include/bits/types/__fpos64_t.h
- /usr/include/bits/types/struct_FILE.h
+ /usr/include/bits/types/__fpos_t.h
+ /usr/include/bits/types/__locale_t.h
+ /usr/include/bits/types/__mbstate_t.h
+ /usr/include/bits/types/__sigset_t.h
+ /usr/include/bits/types/clock_t.h
+ /usr/include/bits/types/clockid_t.h
/usr/include/bits/types/cookie_io_functions_t.h
- /usr/include/bits/stdio_lim.h
- /usr/include/bits/stdio.h
- /usr/include/c++/12/cerrno
- /usr/include/errno.h
- /usr/include/bits/errno.h
- /usr/include/linux/errno.h
- /usr/include/asm/errno.h
- /usr/include/asm-generic/errno.h
- /usr/include/asm-generic/errno-base.h
/usr/include/bits/types/error_t.h
- /usr/include/c++/12/bits/charconv.h
- /usr/include/c++/12/bits/functional_hash.h
- /usr/include/c++/12/bits/hash_bytes.h
- /usr/include/c++/12/bits/basic_string.tcc
- /usr/include/c++/12/utility
- /usr/include/c++/12/bits/stl_relops.h
- /usr/include/c++/12/iterator
- /usr/include/c++/12/bits/stream_iterator.h
- /usr/include/c++/12/bits/streambuf_iterator.h
- /usr/include/c++/12/streambuf
- /usr/include/c++/12/bits/ios_base.h
- /usr/include/c++/12/ext/atomicity.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/gthr.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/gthr-default.h
- /usr/include/pthread.h
- /usr/include/sched.h
- /usr/include/bits/sched.h
+ /usr/include/bits/types/locale_t.h
+ /usr/include/bits/types/mbstate_t.h
+ /usr/include/bits/types/sigset_t.h
+ /usr/include/bits/types/struct_FILE.h
+ /usr/include/bits/types/struct___jmp_buf_tag.h
+ /usr/include/bits/types/struct_itimerspec.h
/usr/include/bits/types/struct_sched_param.h
- /usr/include/bits/cpu-set.h
- /usr/include/time.h
- /usr/include/bits/time.h
- /usr/include/bits/timex.h
+ /usr/include/bits/types/struct_timespec.h
+ /usr/include/bits/types/struct_timeval.h
/usr/include/bits/types/struct_tm.h
- /usr/include/bits/types/struct_itimerspec.h
- /usr/include/bits/setjmp.h
- /usr/include/bits/types/struct___jmp_buf_tag.h
- /usr/include/bits/pthread_stack_min-dynamic.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/atomic_word.h
- /usr/include/sys/single_threaded.h
- /usr/include/c++/12/bits/locale_classes.h
- /usr/include/c++/12/bits/locale_classes.tcc
- /usr/include/c++/12/system_error
- /usr/include/c++/12/x86_64-redhat-linux/bits/error_constants.h
- /usr/include/c++/12/stdexcept
- /usr/include/c++/12/exception
- /usr/include/c++/12/bits/exception_ptr.h
- /usr/include/c++/12/bits/cxxabi_init_exception.h
- /usr/include/c++/12/typeinfo
- /usr/include/c++/12/bits/nested_exception.h
- /usr/include/c++/12/bits/streambuf.tcc
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/optional.hpp
- /usr/include/c++/12/memory
- /usr/include/c++/12/bits/stl_uninitialized.h
- /usr/include/c++/12/bits/stl_tempbuf.h
- /usr/include/c++/12/bits/stl_raw_storage_iter.h
- /usr/include/c++/12/bits/align.h
- /usr/include/c++/12/bit
- /usr/include/c++/12/bits/uses_allocator.h
- /usr/include/c++/12/bits/unique_ptr.h
- /usr/include/c++/12/tuple
- /usr/include/c++/12/bits/shared_ptr.h
- /usr/include/c++/12/bits/shared_ptr_base.h
- /usr/include/c++/12/bits/allocated_ptr.h
- /usr/include/c++/12/ext/aligned_buffer.h
- /usr/include/c++/12/ext/concurrence.h
- /usr/include/c++/12/bits/shared_ptr_atomic.h
- /usr/include/c++/12/bits/atomic_base.h
- /usr/include/c++/12/bits/atomic_lockfree_defines.h
- /usr/include/c++/12/backward/auto_ptr.h
- /usr/include/c++/12/algorithm
- /usr/include/c++/12/bits/stl_algo.h
- /usr/include/c++/12/bits/algorithmfwd.h
- /usr/include/c++/12/bits/stl_heap.h
- /usr/include/c++/12/bits/uniform_int_dist.h
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/string_view.hpp
- /usr/include/c++/12/cassert
- /usr/include/assert.h
- /usr/include/c++/12/limits
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/grammar.hpp
- /usr/include/c++/12/locale
- /usr/include/c++/12/bits/locale_facets.h
- /usr/include/c++/12/cwctype
- /usr/include/wctype.h
+ /usr/include/bits/types/time_t.h
+ /usr/include/bits/types/timer_t.h
+ /usr/include/bits/types/wint_t.h
+ /usr/include/bits/typesizes.h
+ /usr/include/bits/uintn-identity.h
+ /usr/include/bits/waitflags.h
+ /usr/include/bits/waitstatus.h
+ /usr/include/bits/wchar.h
/usr/include/bits/wctype-wchar.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/ctype_base.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/ctype_inline.h
- /usr/include/c++/12/bits/locale_facets.tcc
- /usr/include/c++/12/bits/locale_facets_nonio.h
- /usr/include/c++/12/ctime
- /usr/include/c++/12/x86_64-redhat-linux/bits/time_members.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/messages_members.h
+ /usr/include/bits/wordsize.h
+ /usr/include/c++/13/algorithm
+ /usr/include/c++/13/backward/auto_ptr.h
+ /usr/include/c++/13/backward/binders.h
+ /usr/include/c++/13/bit
+ /usr/include/c++/13/bits/algorithmfwd.h
+ /usr/include/c++/13/bits/align.h
+ /usr/include/c++/13/bits/alloc_traits.h
+ /usr/include/c++/13/bits/allocated_ptr.h
+ /usr/include/c++/13/bits/allocator.h
+ /usr/include/c++/13/bits/atomic_base.h
+ /usr/include/c++/13/bits/atomic_lockfree_defines.h
+ /usr/include/c++/13/bits/basic_string.h
+ /usr/include/c++/13/bits/basic_string.tcc
+ /usr/include/c++/13/bits/char_traits.h
+ /usr/include/c++/13/bits/charconv.h
+ /usr/include/c++/13/bits/codecvt.h
+ /usr/include/c++/13/bits/concept_check.h
+ /usr/include/c++/13/bits/cpp_type_traits.h
+ /usr/include/c++/13/bits/cxxabi_forced.h
+ /usr/include/c++/13/bits/cxxabi_init_exception.h
+ /usr/include/c++/13/bits/exception.h
+ /usr/include/c++/13/bits/exception_defines.h
+ /usr/include/c++/13/bits/exception_ptr.h
+ /usr/include/c++/13/bits/functexcept.h
+ /usr/include/c++/13/bits/functional_hash.h
+ /usr/include/c++/13/bits/hash_bytes.h
+ /usr/include/c++/13/bits/invoke.h
+ /usr/include/c++/13/bits/ios_base.h
+ /usr/include/c++/13/bits/locale_classes.h
+ /usr/include/c++/13/bits/locale_classes.tcc
+ /usr/include/c++/13/bits/locale_conv.h
+ /usr/include/c++/13/bits/locale_facets.h
+ /usr/include/c++/13/bits/locale_facets.tcc
+ /usr/include/c++/13/bits/locale_facets_nonio.h
+ /usr/include/c++/13/bits/locale_facets_nonio.tcc
+ /usr/include/c++/13/bits/localefwd.h
+ /usr/include/c++/13/bits/memoryfwd.h
+ /usr/include/c++/13/bits/move.h
+ /usr/include/c++/13/bits/nested_exception.h
+ /usr/include/c++/13/bits/new_allocator.h
+ /usr/include/c++/13/bits/ostream_insert.h
+ /usr/include/c++/13/bits/postypes.h
+ /usr/include/c++/13/bits/predefined_ops.h
+ /usr/include/c++/13/bits/ptr_traits.h
+ /usr/include/c++/13/bits/range_access.h
+ /usr/include/c++/13/bits/refwrap.h
+ /usr/include/c++/13/bits/requires_hosted.h
+ /usr/include/c++/13/bits/shared_ptr.h
+ /usr/include/c++/13/bits/shared_ptr_atomic.h
+ /usr/include/c++/13/bits/shared_ptr_base.h
+ /usr/include/c++/13/bits/std_abs.h
+ /usr/include/c++/13/bits/stl_algo.h
+ /usr/include/c++/13/bits/stl_algobase.h
+ /usr/include/c++/13/bits/stl_construct.h
+ /usr/include/c++/13/bits/stl_function.h
+ /usr/include/c++/13/bits/stl_heap.h
+ /usr/include/c++/13/bits/stl_iterator.h
+ /usr/include/c++/13/bits/stl_iterator_base_funcs.h
+ /usr/include/c++/13/bits/stl_iterator_base_types.h
+ /usr/include/c++/13/bits/stl_pair.h
+ /usr/include/c++/13/bits/stl_raw_storage_iter.h
+ /usr/include/c++/13/bits/stl_relops.h
+ /usr/include/c++/13/bits/stl_tempbuf.h
+ /usr/include/c++/13/bits/stl_uninitialized.h
+ /usr/include/c++/13/bits/stream_iterator.h
+ /usr/include/c++/13/bits/streambuf.tcc
+ /usr/include/c++/13/bits/streambuf_iterator.h
+ /usr/include/c++/13/bits/stringfwd.h
+ /usr/include/c++/13/bits/uniform_int_dist.h
+ /usr/include/c++/13/bits/unique_ptr.h
+ /usr/include/c++/13/bits/uses_allocator.h
+ /usr/include/c++/13/bits/utility.h
+ /usr/include/c++/13/cassert
+ /usr/include/c++/13/cctype
+ /usr/include/c++/13/cerrno
+ /usr/include/c++/13/clocale
+ /usr/include/c++/13/cstdio
+ /usr/include/c++/13/cstdlib
+ /usr/include/c++/13/cstring
+ /usr/include/c++/13/ctime
+ /usr/include/c++/13/cwchar
+ /usr/include/c++/13/cwctype
+ /usr/include/c++/13/debug/assertions.h
+ /usr/include/c++/13/debug/debug.h
+ /usr/include/c++/13/exception
+ /usr/include/c++/13/ext/aligned_buffer.h
+ /usr/include/c++/13/ext/alloc_traits.h
+ /usr/include/c++/13/ext/atomicity.h
+ /usr/include/c++/13/ext/concurrence.h
+ /usr/include/c++/13/ext/numeric_traits.h
+ /usr/include/c++/13/ext/string_conversions.h
+ /usr/include/c++/13/ext/type_traits.h
+ /usr/include/c++/13/initializer_list
+ /usr/include/c++/13/iosfwd
+ /usr/include/c++/13/iterator
+ /usr/include/c++/13/limits
+ /usr/include/c++/13/locale
+ /usr/include/c++/13/memory
+ /usr/include/c++/13/new
+ /usr/include/c++/13/stdexcept
+ /usr/include/c++/13/streambuf
+ /usr/include/c++/13/string
+ /usr/include/c++/13/system_error
+ /usr/include/c++/13/tuple
+ /usr/include/c++/13/type_traits
+ /usr/include/c++/13/typeinfo
+ /usr/include/c++/13/utility
+ /usr/include/c++/13/x86_64-redhat-linux/bits/atomic_word.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++allocator.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++config.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++locale.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/cpu_defines.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/ctype_base.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/ctype_inline.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/error_constants.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/gthr-default.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/gthr.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/messages_members.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/os_defines.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/time_members.h
+ /usr/include/ctype.h
+ /usr/include/endian.h
+ /usr/include/errno.h
+ /usr/include/features-time64.h
+ /usr/include/features.h
+ /usr/include/gnu/stubs-64.h
+ /usr/include/gnu/stubs.h
/usr/include/libintl.h
- /usr/include/c++/12/bits/codecvt.h
- /usr/include/c++/12/bits/locale_facets_nonio.tcc
- /usr/include/c++/12/bits/locale_conv.h
- /usr/include/c++/12/cstring
+ /usr/include/linux/errno.h
+ /usr/include/locale.h
+ /usr/include/pthread.h
+ /usr/include/sched.h
+ /usr/include/stdc-predef.h
+ /usr/include/stdint.h
+ /usr/include/stdio.h
+ /usr/include/stdlib.h
/usr/include/string.h
/usr/include/strings.h
-
-third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.o
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_resolve.cpp
- /usr/include/stdc-predef.h
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_resolve.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/uri.hpp
- /usr/include/c++/12/iterator
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++config.h
- /usr/include/bits/wordsize.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/os_defines.h
- /usr/include/features.h
- /usr/include/features-time64.h
- /usr/include/bits/timesize.h
/usr/include/sys/cdefs.h
- /usr/include/bits/long-double.h
- /usr/include/gnu/stubs.h
- /usr/include/gnu/stubs-64.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/cpu_defines.h
- /usr/include/c++/12/bits/stl_iterator_base_types.h
- /usr/include/c++/12/type_traits
- /usr/include/c++/12/bits/stl_iterator_base_funcs.h
- /usr/include/c++/12/bits/concept_check.h
- /usr/include/c++/12/debug/assertions.h
- /usr/include/c++/12/bits/stl_iterator.h
- /usr/include/c++/12/bits/cpp_type_traits.h
- /usr/include/c++/12/ext/type_traits.h
- /usr/include/c++/12/bits/move.h
- /usr/include/c++/12/bits/ptr_traits.h
- /usr/include/c++/12/iosfwd
- /usr/include/c++/12/bits/stringfwd.h
- /usr/include/c++/12/bits/memoryfwd.h
- /usr/include/c++/12/bits/postypes.h
- /usr/include/c++/12/cwchar
+ /usr/include/sys/select.h
+ /usr/include/sys/single_threaded.h
+ /usr/include/sys/types.h
+ /usr/include/time.h
/usr/include/wchar.h
- /usr/include/bits/libc-header-start.h
- /usr/include/bits/floatn.h
- /usr/include/bits/floatn-common.h
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stddef.h
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stdarg.h
- /usr/include/bits/wchar.h
- /usr/include/bits/types/wint_t.h
- /usr/include/bits/types/mbstate_t.h
- /usr/include/bits/types/__mbstate_t.h
- /usr/include/bits/types/__FILE.h
- /usr/include/bits/types/FILE.h
- /usr/include/bits/types/locale_t.h
- /usr/include/bits/types/__locale_t.h
- /usr/include/c++/12/bits/stream_iterator.h
- /usr/include/c++/12/debug/debug.h
- /usr/include/c++/12/bits/streambuf_iterator.h
- /usr/include/c++/12/streambuf
- /usr/include/c++/12/bits/localefwd.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++locale.h
- /usr/include/c++/12/clocale
- /usr/include/locale.h
- /usr/include/bits/locale.h
- /usr/include/c++/12/cctype
- /usr/include/ctype.h
- /usr/include/bits/types.h
- /usr/include/bits/typesizes.h
- /usr/include/bits/time64.h
+ /usr/include/wctype.h
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stdarg.h
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stddef.h
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stdint.h
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/optional.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/string_view.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/detail/uri_parts.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/grammar.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_parse_authority.hpp
+
+third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.o
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_resolve.cpp
+ /usr/include/alloca.h
+ /usr/include/asm-generic/errno-base.h
+ /usr/include/asm-generic/errno.h
+ /usr/include/asm/errno.h
+ /usr/include/assert.h
+ /usr/include/bits/atomic_wide_counter.h
+ /usr/include/bits/byteswap.h
+ /usr/include/bits/cpu-set.h
/usr/include/bits/endian.h
/usr/include/bits/endianness.h
- /usr/include/c++/12/bits/ios_base.h
- /usr/include/c++/12/ext/atomicity.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/gthr.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/gthr-default.h
- /usr/include/pthread.h
- /usr/include/sched.h
- /usr/include/bits/types/time_t.h
- /usr/include/bits/types/struct_timespec.h
+ /usr/include/bits/errno.h
+ /usr/include/bits/floatn-common.h
+ /usr/include/bits/floatn.h
+ /usr/include/bits/libc-header-start.h
+ /usr/include/bits/locale.h
+ /usr/include/bits/long-double.h
+ /usr/include/bits/pthread_stack_min-dynamic.h
+ /usr/include/bits/pthreadtypes-arch.h
+ /usr/include/bits/pthreadtypes.h
/usr/include/bits/sched.h
- /usr/include/bits/types/struct_sched_param.h
- /usr/include/bits/cpu-set.h
- /usr/include/time.h
+ /usr/include/bits/select.h
+ /usr/include/bits/setjmp.h
+ /usr/include/bits/stdint-intn.h
+ /usr/include/bits/stdint-uintn.h
+ /usr/include/bits/stdio.h
+ /usr/include/bits/stdio_lim.h
+ /usr/include/bits/stdlib-bsearch.h
+ /usr/include/bits/stdlib-float.h
+ /usr/include/bits/struct_mutex.h
+ /usr/include/bits/struct_rwlock.h
+ /usr/include/bits/thread-shared-types.h
/usr/include/bits/time.h
+ /usr/include/bits/time64.h
+ /usr/include/bits/timesize.h
/usr/include/bits/timex.h
- /usr/include/bits/types/struct_timeval.h
+ /usr/include/bits/types.h
+ /usr/include/bits/types/FILE.h
+ /usr/include/bits/types/__FILE.h
+ /usr/include/bits/types/__fpos64_t.h
+ /usr/include/bits/types/__fpos_t.h
+ /usr/include/bits/types/__locale_t.h
+ /usr/include/bits/types/__mbstate_t.h
+ /usr/include/bits/types/__sigset_t.h
/usr/include/bits/types/clock_t.h
- /usr/include/bits/types/struct_tm.h
/usr/include/bits/types/clockid_t.h
- /usr/include/bits/types/timer_t.h
- /usr/include/bits/types/struct_itimerspec.h
- /usr/include/bits/pthreadtypes.h
- /usr/include/bits/thread-shared-types.h
- /usr/include/bits/pthreadtypes-arch.h
- /usr/include/bits/atomic_wide_counter.h
- /usr/include/bits/struct_mutex.h
- /usr/include/bits/struct_rwlock.h
- /usr/include/bits/setjmp.h
- /usr/include/bits/types/__sigset_t.h
+ /usr/include/bits/types/cookie_io_functions_t.h
+ /usr/include/bits/types/error_t.h
+ /usr/include/bits/types/locale_t.h
+ /usr/include/bits/types/mbstate_t.h
+ /usr/include/bits/types/sigset_t.h
+ /usr/include/bits/types/struct_FILE.h
/usr/include/bits/types/struct___jmp_buf_tag.h
- /usr/include/bits/pthread_stack_min-dynamic.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/atomic_word.h
- /usr/include/sys/single_threaded.h
- /usr/include/c++/12/bits/locale_classes.h
- /usr/include/c++/12/string
- /usr/include/c++/12/bits/char_traits.h
- /usr/include/c++/12/cstdint
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stdint.h
- /usr/include/stdint.h
- /usr/include/bits/stdint-intn.h
- /usr/include/bits/stdint-uintn.h
- /usr/include/c++/12/bits/allocator.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++allocator.h
- /usr/include/c++/12/bits/new_allocator.h
- /usr/include/c++/12/new
- /usr/include/c++/12/bits/exception.h
- /usr/include/c++/12/bits/functexcept.h
- /usr/include/c++/12/bits/exception_defines.h
- /usr/include/c++/12/bits/ostream_insert.h
- /usr/include/c++/12/bits/cxxabi_forced.h
- /usr/include/c++/12/bits/stl_function.h
- /usr/include/c++/12/backward/binders.h
- /usr/include/c++/12/ext/numeric_traits.h
- /usr/include/c++/12/bits/stl_algobase.h
- /usr/include/c++/12/bits/stl_pair.h
- /usr/include/c++/12/bits/utility.h
- /usr/include/c++/12/bits/predefined_ops.h
- /usr/include/c++/12/bits/refwrap.h
- /usr/include/c++/12/bits/invoke.h
- /usr/include/c++/12/bits/range_access.h
- /usr/include/c++/12/initializer_list
- /usr/include/c++/12/bits/basic_string.h
- /usr/include/c++/12/ext/alloc_traits.h
- /usr/include/c++/12/bits/alloc_traits.h
- /usr/include/c++/12/bits/stl_construct.h
- /usr/include/c++/12/ext/string_conversions.h
- /usr/include/c++/12/cstdlib
- /usr/include/stdlib.h
+ /usr/include/bits/types/struct_itimerspec.h
+ /usr/include/bits/types/struct_sched_param.h
+ /usr/include/bits/types/struct_timespec.h
+ /usr/include/bits/types/struct_timeval.h
+ /usr/include/bits/types/struct_tm.h
+ /usr/include/bits/types/time_t.h
+ /usr/include/bits/types/timer_t.h
+ /usr/include/bits/types/wint_t.h
+ /usr/include/bits/typesizes.h
+ /usr/include/bits/uintn-identity.h
/usr/include/bits/waitflags.h
/usr/include/bits/waitstatus.h
- /usr/include/sys/types.h
+ /usr/include/bits/wchar.h
+ /usr/include/bits/wordsize.h
+ /usr/include/c++/13/algorithm
+ /usr/include/c++/13/backward/auto_ptr.h
+ /usr/include/c++/13/backward/binders.h
+ /usr/include/c++/13/bit
+ /usr/include/c++/13/bits/algorithmfwd.h
+ /usr/include/c++/13/bits/align.h
+ /usr/include/c++/13/bits/alloc_traits.h
+ /usr/include/c++/13/bits/allocated_ptr.h
+ /usr/include/c++/13/bits/allocator.h
+ /usr/include/c++/13/bits/atomic_base.h
+ /usr/include/c++/13/bits/atomic_lockfree_defines.h
+ /usr/include/c++/13/bits/basic_string.h
+ /usr/include/c++/13/bits/basic_string.tcc
+ /usr/include/c++/13/bits/char_traits.h
+ /usr/include/c++/13/bits/charconv.h
+ /usr/include/c++/13/bits/concept_check.h
+ /usr/include/c++/13/bits/cpp_type_traits.h
+ /usr/include/c++/13/bits/cxxabi_forced.h
+ /usr/include/c++/13/bits/cxxabi_init_exception.h
+ /usr/include/c++/13/bits/exception.h
+ /usr/include/c++/13/bits/exception_defines.h
+ /usr/include/c++/13/bits/exception_ptr.h
+ /usr/include/c++/13/bits/functexcept.h
+ /usr/include/c++/13/bits/functional_hash.h
+ /usr/include/c++/13/bits/hash_bytes.h
+ /usr/include/c++/13/bits/invoke.h
+ /usr/include/c++/13/bits/ios_base.h
+ /usr/include/c++/13/bits/locale_classes.h
+ /usr/include/c++/13/bits/locale_classes.tcc
+ /usr/include/c++/13/bits/localefwd.h
+ /usr/include/c++/13/bits/memoryfwd.h
+ /usr/include/c++/13/bits/move.h
+ /usr/include/c++/13/bits/nested_exception.h
+ /usr/include/c++/13/bits/new_allocator.h
+ /usr/include/c++/13/bits/ostream_insert.h
+ /usr/include/c++/13/bits/postypes.h
+ /usr/include/c++/13/bits/predefined_ops.h
+ /usr/include/c++/13/bits/ptr_traits.h
+ /usr/include/c++/13/bits/range_access.h
+ /usr/include/c++/13/bits/refwrap.h
+ /usr/include/c++/13/bits/requires_hosted.h
+ /usr/include/c++/13/bits/shared_ptr.h
+ /usr/include/c++/13/bits/shared_ptr_atomic.h
+ /usr/include/c++/13/bits/shared_ptr_base.h
+ /usr/include/c++/13/bits/std_abs.h
+ /usr/include/c++/13/bits/std_function.h
+ /usr/include/c++/13/bits/stl_algo.h
+ /usr/include/c++/13/bits/stl_algobase.h
+ /usr/include/c++/13/bits/stl_construct.h
+ /usr/include/c++/13/bits/stl_function.h
+ /usr/include/c++/13/bits/stl_heap.h
+ /usr/include/c++/13/bits/stl_iterator.h
+ /usr/include/c++/13/bits/stl_iterator_base_funcs.h
+ /usr/include/c++/13/bits/stl_iterator_base_types.h
+ /usr/include/c++/13/bits/stl_pair.h
+ /usr/include/c++/13/bits/stl_raw_storage_iter.h
+ /usr/include/c++/13/bits/stl_relops.h
+ /usr/include/c++/13/bits/stl_tempbuf.h
+ /usr/include/c++/13/bits/stl_uninitialized.h
+ /usr/include/c++/13/bits/stream_iterator.h
+ /usr/include/c++/13/bits/streambuf.tcc
+ /usr/include/c++/13/bits/streambuf_iterator.h
+ /usr/include/c++/13/bits/stringfwd.h
+ /usr/include/c++/13/bits/uniform_int_dist.h
+ /usr/include/c++/13/bits/unique_ptr.h
+ /usr/include/c++/13/bits/uses_allocator.h
+ /usr/include/c++/13/bits/utility.h
+ /usr/include/c++/13/cassert
+ /usr/include/c++/13/cctype
+ /usr/include/c++/13/cerrno
+ /usr/include/c++/13/clocale
+ /usr/include/c++/13/cstddef
+ /usr/include/c++/13/cstdint
+ /usr/include/c++/13/cstdio
+ /usr/include/c++/13/cstdlib
+ /usr/include/c++/13/cstring
+ /usr/include/c++/13/cwchar
+ /usr/include/c++/13/debug/assertions.h
+ /usr/include/c++/13/debug/debug.h
+ /usr/include/c++/13/exception
+ /usr/include/c++/13/ext/aligned_buffer.h
+ /usr/include/c++/13/ext/alloc_traits.h
+ /usr/include/c++/13/ext/atomicity.h
+ /usr/include/c++/13/ext/concurrence.h
+ /usr/include/c++/13/ext/numeric_traits.h
+ /usr/include/c++/13/ext/string_conversions.h
+ /usr/include/c++/13/ext/type_traits.h
+ /usr/include/c++/13/functional
+ /usr/include/c++/13/initializer_list
+ /usr/include/c++/13/iosfwd
+ /usr/include/c++/13/iterator
+ /usr/include/c++/13/memory
+ /usr/include/c++/13/new
+ /usr/include/c++/13/stdexcept
+ /usr/include/c++/13/streambuf
+ /usr/include/c++/13/string
+ /usr/include/c++/13/system_error
+ /usr/include/c++/13/tuple
+ /usr/include/c++/13/type_traits
+ /usr/include/c++/13/typeinfo
+ /usr/include/c++/13/utility
+ /usr/include/c++/13/x86_64-redhat-linux/bits/atomic_word.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++allocator.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++config.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++locale.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/cpu_defines.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/error_constants.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/gthr-default.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/gthr.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/os_defines.h
+ /usr/include/ctype.h
/usr/include/endian.h
- /usr/include/bits/byteswap.h
- /usr/include/bits/uintn-identity.h
- /usr/include/sys/select.h
- /usr/include/bits/select.h
- /usr/include/bits/types/sigset_t.h
- /usr/include/alloca.h
- /usr/include/bits/stdlib-bsearch.h
- /usr/include/bits/stdlib-float.h
- /usr/include/c++/12/bits/std_abs.h
- /usr/include/c++/12/cstdio
- /usr/include/stdio.h
- /usr/include/bits/types/__fpos_t.h
- /usr/include/bits/types/__fpos64_t.h
- /usr/include/bits/types/struct_FILE.h
- /usr/include/bits/types/cookie_io_functions_t.h
- /usr/include/bits/stdio_lim.h
- /usr/include/bits/stdio.h
- /usr/include/c++/12/cerrno
/usr/include/errno.h
- /usr/include/bits/errno.h
+ /usr/include/features-time64.h
+ /usr/include/features.h
+ /usr/include/gnu/stubs-64.h
+ /usr/include/gnu/stubs.h
/usr/include/linux/errno.h
- /usr/include/asm/errno.h
- /usr/include/asm-generic/errno.h
- /usr/include/asm-generic/errno-base.h
- /usr/include/bits/types/error_t.h
- /usr/include/c++/12/bits/charconv.h
- /usr/include/c++/12/bits/functional_hash.h
- /usr/include/c++/12/bits/hash_bytes.h
- /usr/include/c++/12/bits/basic_string.tcc
- /usr/include/c++/12/bits/locale_classes.tcc
- /usr/include/c++/12/system_error
- /usr/include/c++/12/x86_64-redhat-linux/bits/error_constants.h
- /usr/include/c++/12/stdexcept
- /usr/include/c++/12/exception
- /usr/include/c++/12/bits/exception_ptr.h
- /usr/include/c++/12/bits/cxxabi_init_exception.h
- /usr/include/c++/12/typeinfo
- /usr/include/c++/12/bits/nested_exception.h
- /usr/include/c++/12/bits/streambuf.tcc
- /usr/include/c++/12/algorithm
- /usr/include/c++/12/bits/stl_algo.h
- /usr/include/c++/12/bits/algorithmfwd.h
- /usr/include/c++/12/bits/stl_heap.h
- /usr/include/c++/12/bits/stl_tempbuf.h
- /usr/include/c++/12/bits/uniform_int_dist.h
- /usr/include/c++/12/functional
- /usr/include/c++/12/tuple
- /usr/include/c++/12/bits/uses_allocator.h
- /usr/include/c++/12/bits/std_function.h
- /usr/include/c++/12/memory
- /usr/include/c++/12/bits/stl_uninitialized.h
- /usr/include/c++/12/bits/stl_raw_storage_iter.h
- /usr/include/c++/12/bits/align.h
- /usr/include/c++/12/bit
- /usr/include/c++/12/bits/unique_ptr.h
- /usr/include/c++/12/bits/shared_ptr.h
- /usr/include/c++/12/bits/shared_ptr_base.h
- /usr/include/c++/12/bits/allocated_ptr.h
- /usr/include/c++/12/ext/aligned_buffer.h
- /usr/include/c++/12/ext/concurrence.h
- /usr/include/c++/12/bits/shared_ptr_atomic.h
- /usr/include/c++/12/bits/atomic_base.h
- /usr/include/c++/12/bits/atomic_lockfree_defines.h
- /usr/include/c++/12/backward/auto_ptr.h
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/string_view.hpp
- /usr/include/c++/12/cassert
- /usr/include/assert.h
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/optional.hpp
- /usr/include/c++/12/utility
- /usr/include/c++/12/bits/stl_relops.h
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/config.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/uri_errors.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/detail/uri_parts.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/detail/encode.hpp
- /usr/include/c++/12/cstring
+ /usr/include/locale.h
+ /usr/include/pthread.h
+ /usr/include/sched.h
+ /usr/include/stdc-predef.h
+ /usr/include/stdint.h
+ /usr/include/stdio.h
+ /usr/include/stdlib.h
/usr/include/string.h
/usr/include/strings.h
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/detail/decode.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/detail/translate.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/uri_builder.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/algorithm_find.hpp
- /usr/include/c++/12/cstddef
+ /usr/include/sys/cdefs.h
+ /usr/include/sys/select.h
+ /usr/include/sys/single_threaded.h
+ /usr/include/sys/types.h
+ /usr/include/time.h
+ /usr/include/wchar.h
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stdarg.h
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stddef.h
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stdint.h
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/optional.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/string_view.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/config.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/detail/decode.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/detail/encode.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/detail/translate.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/detail/uri_parts.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/uri.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/uri_builder.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/uri_errors.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/algorithm_find.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_resolve.hpp
third_party/uri/src/CMakeFiles/network-uri.dir/uri.cpp.o
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/uri.cpp
- /usr/include/stdc-predef.h
- /usr/include/c++/12/cassert
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++config.h
- /usr/include/bits/wordsize.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/os_defines.h
- /usr/include/features.h
- /usr/include/features-time64.h
- /usr/include/bits/timesize.h
- /usr/include/sys/cdefs.h
- /usr/include/bits/long-double.h
- /usr/include/gnu/stubs.h
- /usr/include/gnu/stubs-64.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/cpu_defines.h
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/uri.cpp
+ /usr/include/alloca.h
+ /usr/include/asm-generic/errno-base.h
+ /usr/include/asm-generic/errno.h
+ /usr/include/asm/errno.h
/usr/include/assert.h
- /usr/include/c++/12/locale
- /usr/include/c++/12/bits/localefwd.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++locale.h
- /usr/include/c++/12/clocale
- /usr/include/locale.h
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stddef.h
- /usr/include/bits/locale.h
- /usr/include/bits/types/locale_t.h
- /usr/include/bits/types/__locale_t.h
- /usr/include/c++/12/iosfwd
- /usr/include/c++/12/bits/stringfwd.h
- /usr/include/c++/12/bits/memoryfwd.h
- /usr/include/c++/12/bits/postypes.h
- /usr/include/c++/12/cwchar
- /usr/include/wchar.h
- /usr/include/bits/libc-header-start.h
- /usr/include/bits/floatn.h
- /usr/include/bits/floatn-common.h
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stdarg.h
- /usr/include/bits/wchar.h
- /usr/include/bits/types/wint_t.h
- /usr/include/bits/types/mbstate_t.h
- /usr/include/bits/types/__mbstate_t.h
- /usr/include/bits/types/__FILE.h
- /usr/include/bits/types/FILE.h
- /usr/include/c++/12/cctype
- /usr/include/ctype.h
- /usr/include/bits/types.h
- /usr/include/bits/typesizes.h
- /usr/include/bits/time64.h
+ /usr/include/bits/atomic_wide_counter.h
+ /usr/include/bits/byteswap.h
+ /usr/include/bits/cpu-set.h
/usr/include/bits/endian.h
/usr/include/bits/endianness.h
- /usr/include/c++/12/bits/locale_classes.h
- /usr/include/c++/12/string
- /usr/include/c++/12/bits/char_traits.h
- /usr/include/c++/12/type_traits
- /usr/include/c++/12/cstdint
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stdint.h
- /usr/include/stdint.h
+ /usr/include/bits/errno.h
+ /usr/include/bits/floatn-common.h
+ /usr/include/bits/floatn.h
+ /usr/include/bits/libc-header-start.h
+ /usr/include/bits/locale.h
+ /usr/include/bits/long-double.h
+ /usr/include/bits/pthread_stack_min-dynamic.h
+ /usr/include/bits/pthreadtypes-arch.h
+ /usr/include/bits/pthreadtypes.h
+ /usr/include/bits/sched.h
+ /usr/include/bits/select.h
+ /usr/include/bits/setjmp.h
/usr/include/bits/stdint-intn.h
/usr/include/bits/stdint-uintn.h
- /usr/include/c++/12/bits/allocator.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++allocator.h
- /usr/include/c++/12/bits/new_allocator.h
- /usr/include/c++/12/new
- /usr/include/c++/12/bits/exception.h
- /usr/include/c++/12/bits/functexcept.h
- /usr/include/c++/12/bits/exception_defines.h
- /usr/include/c++/12/bits/move.h
- /usr/include/c++/12/bits/cpp_type_traits.h
- /usr/include/c++/12/bits/ostream_insert.h
- /usr/include/c++/12/bits/cxxabi_forced.h
- /usr/include/c++/12/bits/stl_iterator_base_types.h
- /usr/include/c++/12/bits/stl_iterator_base_funcs.h
- /usr/include/c++/12/bits/concept_check.h
- /usr/include/c++/12/debug/assertions.h
- /usr/include/c++/12/bits/stl_iterator.h
- /usr/include/c++/12/ext/type_traits.h
- /usr/include/c++/12/bits/ptr_traits.h
- /usr/include/c++/12/bits/stl_function.h
- /usr/include/c++/12/backward/binders.h
- /usr/include/c++/12/ext/numeric_traits.h
- /usr/include/c++/12/bits/stl_algobase.h
- /usr/include/c++/12/bits/stl_pair.h
- /usr/include/c++/12/bits/utility.h
- /usr/include/c++/12/debug/debug.h
- /usr/include/c++/12/bits/predefined_ops.h
- /usr/include/c++/12/bits/refwrap.h
- /usr/include/c++/12/bits/invoke.h
- /usr/include/c++/12/bits/range_access.h
- /usr/include/c++/12/initializer_list
- /usr/include/c++/12/bits/basic_string.h
- /usr/include/c++/12/ext/alloc_traits.h
- /usr/include/c++/12/bits/alloc_traits.h
- /usr/include/c++/12/bits/stl_construct.h
- /usr/include/c++/12/ext/string_conversions.h
- /usr/include/c++/12/cstdlib
- /usr/include/stdlib.h
- /usr/include/bits/waitflags.h
- /usr/include/bits/waitstatus.h
- /usr/include/sys/types.h
- /usr/include/bits/types/clock_t.h
- /usr/include/bits/types/clockid_t.h
- /usr/include/bits/types/time_t.h
- /usr/include/bits/types/timer_t.h
- /usr/include/endian.h
- /usr/include/bits/byteswap.h
- /usr/include/bits/uintn-identity.h
- /usr/include/sys/select.h
- /usr/include/bits/select.h
- /usr/include/bits/types/sigset_t.h
- /usr/include/bits/types/__sigset_t.h
- /usr/include/bits/types/struct_timeval.h
- /usr/include/bits/types/struct_timespec.h
- /usr/include/bits/pthreadtypes.h
- /usr/include/bits/thread-shared-types.h
- /usr/include/bits/pthreadtypes-arch.h
- /usr/include/bits/atomic_wide_counter.h
- /usr/include/bits/struct_mutex.h
- /usr/include/bits/struct_rwlock.h
- /usr/include/alloca.h
+ /usr/include/bits/stdio.h
+ /usr/include/bits/stdio_lim.h
/usr/include/bits/stdlib-bsearch.h
/usr/include/bits/stdlib-float.h
- /usr/include/c++/12/bits/std_abs.h
- /usr/include/c++/12/cstdio
- /usr/include/stdio.h
- /usr/include/bits/types/__fpos_t.h
+ /usr/include/bits/struct_mutex.h
+ /usr/include/bits/struct_rwlock.h
+ /usr/include/bits/thread-shared-types.h
+ /usr/include/bits/time.h
+ /usr/include/bits/time64.h
+ /usr/include/bits/timesize.h
+ /usr/include/bits/timex.h
+ /usr/include/bits/types.h
+ /usr/include/bits/types/FILE.h
+ /usr/include/bits/types/__FILE.h
/usr/include/bits/types/__fpos64_t.h
- /usr/include/bits/types/struct_FILE.h
+ /usr/include/bits/types/__fpos_t.h
+ /usr/include/bits/types/__locale_t.h
+ /usr/include/bits/types/__mbstate_t.h
+ /usr/include/bits/types/__sigset_t.h
+ /usr/include/bits/types/clock_t.h
+ /usr/include/bits/types/clockid_t.h
/usr/include/bits/types/cookie_io_functions_t.h
- /usr/include/bits/stdio_lim.h
- /usr/include/bits/stdio.h
- /usr/include/c++/12/cerrno
- /usr/include/errno.h
- /usr/include/bits/errno.h
- /usr/include/linux/errno.h
- /usr/include/asm/errno.h
- /usr/include/asm-generic/errno.h
- /usr/include/asm-generic/errno-base.h
/usr/include/bits/types/error_t.h
- /usr/include/c++/12/bits/charconv.h
- /usr/include/c++/12/bits/functional_hash.h
- /usr/include/c++/12/bits/hash_bytes.h
- /usr/include/c++/12/bits/basic_string.tcc
- /usr/include/c++/12/ext/atomicity.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/gthr.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/gthr-default.h
- /usr/include/pthread.h
- /usr/include/sched.h
- /usr/include/bits/sched.h
+ /usr/include/bits/types/locale_t.h
+ /usr/include/bits/types/mbstate_t.h
+ /usr/include/bits/types/sigset_t.h
+ /usr/include/bits/types/struct_FILE.h
+ /usr/include/bits/types/struct___jmp_buf_tag.h
+ /usr/include/bits/types/struct_itimerspec.h
/usr/include/bits/types/struct_sched_param.h
- /usr/include/bits/cpu-set.h
- /usr/include/time.h
- /usr/include/bits/time.h
- /usr/include/bits/timex.h
+ /usr/include/bits/types/struct_timespec.h
+ /usr/include/bits/types/struct_timeval.h
/usr/include/bits/types/struct_tm.h
- /usr/include/bits/types/struct_itimerspec.h
- /usr/include/bits/setjmp.h
- /usr/include/bits/types/struct___jmp_buf_tag.h
- /usr/include/bits/pthread_stack_min-dynamic.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/atomic_word.h
- /usr/include/sys/single_threaded.h
- /usr/include/c++/12/bits/locale_classes.tcc
- /usr/include/c++/12/bits/locale_facets.h
- /usr/include/c++/12/cwctype
- /usr/include/wctype.h
+ /usr/include/bits/types/time_t.h
+ /usr/include/bits/types/timer_t.h
+ /usr/include/bits/types/wint_t.h
+ /usr/include/bits/typesizes.h
+ /usr/include/bits/uintn-identity.h
+ /usr/include/bits/waitflags.h
+ /usr/include/bits/waitstatus.h
+ /usr/include/bits/wchar.h
/usr/include/bits/wctype-wchar.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/ctype_base.h
- /usr/include/c++/12/bits/ios_base.h
- /usr/include/c++/12/system_error
- /usr/include/c++/12/x86_64-redhat-linux/bits/error_constants.h
- /usr/include/c++/12/stdexcept
- /usr/include/c++/12/exception
- /usr/include/c++/12/bits/exception_ptr.h
- /usr/include/c++/12/bits/cxxabi_init_exception.h
- /usr/include/c++/12/typeinfo
- /usr/include/c++/12/bits/nested_exception.h
- /usr/include/c++/12/streambuf
- /usr/include/c++/12/bits/streambuf.tcc
- /usr/include/c++/12/bits/streambuf_iterator.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/ctype_inline.h
- /usr/include/c++/12/bits/locale_facets.tcc
- /usr/include/c++/12/bits/locale_facets_nonio.h
- /usr/include/c++/12/ctime
- /usr/include/c++/12/x86_64-redhat-linux/bits/time_members.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/messages_members.h
- /usr/include/libintl.h
- /usr/include/c++/12/bits/codecvt.h
- /usr/include/c++/12/bits/locale_facets_nonio.tcc
- /usr/include/c++/12/bits/locale_conv.h
- /usr/include/c++/12/algorithm
- /usr/include/c++/12/bits/stl_algo.h
- /usr/include/c++/12/bits/algorithmfwd.h
- /usr/include/c++/12/bits/stl_heap.h
- /usr/include/c++/12/bits/stl_tempbuf.h
- /usr/include/c++/12/bits/uniform_int_dist.h
- /usr/include/c++/12/functional
- /usr/include/c++/12/tuple
- /usr/include/c++/12/bits/uses_allocator.h
- /usr/include/c++/12/bits/std_function.h
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/uri.hpp
- /usr/include/c++/12/iterator
- /usr/include/c++/12/bits/stream_iterator.h
- /usr/include/c++/12/memory
- /usr/include/c++/12/bits/stl_uninitialized.h
- /usr/include/c++/12/bits/stl_raw_storage_iter.h
- /usr/include/c++/12/bits/align.h
- /usr/include/c++/12/bit
- /usr/include/c++/12/bits/unique_ptr.h
- /usr/include/c++/12/bits/shared_ptr.h
- /usr/include/c++/12/bits/shared_ptr_base.h
- /usr/include/c++/12/bits/allocated_ptr.h
- /usr/include/c++/12/ext/aligned_buffer.h
- /usr/include/c++/12/ext/concurrence.h
- /usr/include/c++/12/bits/shared_ptr_atomic.h
- /usr/include/c++/12/bits/atomic_base.h
- /usr/include/c++/12/bits/atomic_lockfree_defines.h
- /usr/include/c++/12/backward/auto_ptr.h
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/string_view.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/optional.hpp
- /usr/include/c++/12/utility
- /usr/include/c++/12/bits/stl_relops.h
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/config.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/uri_errors.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/detail/uri_parts.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/detail/encode.hpp
- /usr/include/c++/12/cstring
- /usr/include/string.h
- /usr/include/strings.h
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/detail/decode.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/detail/translate.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/uri_builder.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_parse.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_advance_parts.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_percent_encode.hpp
- /usr/include/c++/12/vector
- /usr/include/c++/12/bits/stl_vector.h
- /usr/include/c++/12/bits/stl_bvector.h
- /usr/include/c++/12/bits/vector.tcc
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_normalize.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_resolve.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/algorithm.hpp
-
-third_party/uri/src/CMakeFiles/network-uri.dir/uri_builder.cpp.o
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/uri_builder.cpp
- /usr/include/stdc-predef.h
- /usr/include/c++/12/locale
- /usr/include/c++/12/bits/localefwd.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++config.h
/usr/include/bits/wordsize.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/os_defines.h
- /usr/include/features.h
+ /usr/include/c++/13/algorithm
+ /usr/include/c++/13/backward/auto_ptr.h
+ /usr/include/c++/13/backward/binders.h
+ /usr/include/c++/13/bit
+ /usr/include/c++/13/bits/algorithmfwd.h
+ /usr/include/c++/13/bits/align.h
+ /usr/include/c++/13/bits/alloc_traits.h
+ /usr/include/c++/13/bits/allocated_ptr.h
+ /usr/include/c++/13/bits/allocator.h
+ /usr/include/c++/13/bits/atomic_base.h
+ /usr/include/c++/13/bits/atomic_lockfree_defines.h
+ /usr/include/c++/13/bits/basic_string.h
+ /usr/include/c++/13/bits/basic_string.tcc
+ /usr/include/c++/13/bits/char_traits.h
+ /usr/include/c++/13/bits/charconv.h
+ /usr/include/c++/13/bits/codecvt.h
+ /usr/include/c++/13/bits/concept_check.h
+ /usr/include/c++/13/bits/cpp_type_traits.h
+ /usr/include/c++/13/bits/cxxabi_forced.h
+ /usr/include/c++/13/bits/cxxabi_init_exception.h
+ /usr/include/c++/13/bits/exception.h
+ /usr/include/c++/13/bits/exception_defines.h
+ /usr/include/c++/13/bits/exception_ptr.h
+ /usr/include/c++/13/bits/functexcept.h
+ /usr/include/c++/13/bits/functional_hash.h
+ /usr/include/c++/13/bits/hash_bytes.h
+ /usr/include/c++/13/bits/invoke.h
+ /usr/include/c++/13/bits/ios_base.h
+ /usr/include/c++/13/bits/locale_classes.h
+ /usr/include/c++/13/bits/locale_classes.tcc
+ /usr/include/c++/13/bits/locale_conv.h
+ /usr/include/c++/13/bits/locale_facets.h
+ /usr/include/c++/13/bits/locale_facets.tcc
+ /usr/include/c++/13/bits/locale_facets_nonio.h
+ /usr/include/c++/13/bits/locale_facets_nonio.tcc
+ /usr/include/c++/13/bits/localefwd.h
+ /usr/include/c++/13/bits/memoryfwd.h
+ /usr/include/c++/13/bits/move.h
+ /usr/include/c++/13/bits/nested_exception.h
+ /usr/include/c++/13/bits/new_allocator.h
+ /usr/include/c++/13/bits/ostream_insert.h
+ /usr/include/c++/13/bits/postypes.h
+ /usr/include/c++/13/bits/predefined_ops.h
+ /usr/include/c++/13/bits/ptr_traits.h
+ /usr/include/c++/13/bits/range_access.h
+ /usr/include/c++/13/bits/refwrap.h
+ /usr/include/c++/13/bits/requires_hosted.h
+ /usr/include/c++/13/bits/shared_ptr.h
+ /usr/include/c++/13/bits/shared_ptr_atomic.h
+ /usr/include/c++/13/bits/shared_ptr_base.h
+ /usr/include/c++/13/bits/std_abs.h
+ /usr/include/c++/13/bits/std_function.h
+ /usr/include/c++/13/bits/stl_algo.h
+ /usr/include/c++/13/bits/stl_algobase.h
+ /usr/include/c++/13/bits/stl_bvector.h
+ /usr/include/c++/13/bits/stl_construct.h
+ /usr/include/c++/13/bits/stl_function.h
+ /usr/include/c++/13/bits/stl_heap.h
+ /usr/include/c++/13/bits/stl_iterator.h
+ /usr/include/c++/13/bits/stl_iterator_base_funcs.h
+ /usr/include/c++/13/bits/stl_iterator_base_types.h
+ /usr/include/c++/13/bits/stl_pair.h
+ /usr/include/c++/13/bits/stl_raw_storage_iter.h
+ /usr/include/c++/13/bits/stl_relops.h
+ /usr/include/c++/13/bits/stl_tempbuf.h
+ /usr/include/c++/13/bits/stl_uninitialized.h
+ /usr/include/c++/13/bits/stl_vector.h
+ /usr/include/c++/13/bits/stream_iterator.h
+ /usr/include/c++/13/bits/streambuf.tcc
+ /usr/include/c++/13/bits/streambuf_iterator.h
+ /usr/include/c++/13/bits/stringfwd.h
+ /usr/include/c++/13/bits/uniform_int_dist.h
+ /usr/include/c++/13/bits/unique_ptr.h
+ /usr/include/c++/13/bits/uses_allocator.h
+ /usr/include/c++/13/bits/utility.h
+ /usr/include/c++/13/bits/vector.tcc
+ /usr/include/c++/13/cassert
+ /usr/include/c++/13/cctype
+ /usr/include/c++/13/cerrno
+ /usr/include/c++/13/clocale
+ /usr/include/c++/13/cstdint
+ /usr/include/c++/13/cstdio
+ /usr/include/c++/13/cstdlib
+ /usr/include/c++/13/cstring
+ /usr/include/c++/13/ctime
+ /usr/include/c++/13/cwchar
+ /usr/include/c++/13/cwctype
+ /usr/include/c++/13/debug/assertions.h
+ /usr/include/c++/13/debug/debug.h
+ /usr/include/c++/13/exception
+ /usr/include/c++/13/ext/aligned_buffer.h
+ /usr/include/c++/13/ext/alloc_traits.h
+ /usr/include/c++/13/ext/atomicity.h
+ /usr/include/c++/13/ext/concurrence.h
+ /usr/include/c++/13/ext/numeric_traits.h
+ /usr/include/c++/13/ext/string_conversions.h
+ /usr/include/c++/13/ext/type_traits.h
+ /usr/include/c++/13/functional
+ /usr/include/c++/13/initializer_list
+ /usr/include/c++/13/iosfwd
+ /usr/include/c++/13/iterator
+ /usr/include/c++/13/locale
+ /usr/include/c++/13/memory
+ /usr/include/c++/13/new
+ /usr/include/c++/13/stdexcept
+ /usr/include/c++/13/streambuf
+ /usr/include/c++/13/string
+ /usr/include/c++/13/system_error
+ /usr/include/c++/13/tuple
+ /usr/include/c++/13/type_traits
+ /usr/include/c++/13/typeinfo
+ /usr/include/c++/13/utility
+ /usr/include/c++/13/vector
+ /usr/include/c++/13/x86_64-redhat-linux/bits/atomic_word.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++allocator.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++config.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++locale.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/cpu_defines.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/ctype_base.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/ctype_inline.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/error_constants.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/gthr-default.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/gthr.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/messages_members.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/os_defines.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/time_members.h
+ /usr/include/ctype.h
+ /usr/include/endian.h
+ /usr/include/errno.h
/usr/include/features-time64.h
- /usr/include/bits/timesize.h
- /usr/include/sys/cdefs.h
- /usr/include/bits/long-double.h
- /usr/include/gnu/stubs.h
+ /usr/include/features.h
/usr/include/gnu/stubs-64.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/cpu_defines.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++locale.h
- /usr/include/c++/12/clocale
+ /usr/include/gnu/stubs.h
+ /usr/include/libintl.h
+ /usr/include/linux/errno.h
/usr/include/locale.h
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stddef.h
- /usr/include/bits/locale.h
- /usr/include/bits/types/locale_t.h
- /usr/include/bits/types/__locale_t.h
- /usr/include/c++/12/iosfwd
- /usr/include/c++/12/bits/stringfwd.h
- /usr/include/c++/12/bits/memoryfwd.h
- /usr/include/c++/12/bits/postypes.h
- /usr/include/c++/12/cwchar
- /usr/include/wchar.h
- /usr/include/bits/libc-header-start.h
- /usr/include/bits/floatn.h
- /usr/include/bits/floatn-common.h
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stdarg.h
- /usr/include/bits/wchar.h
- /usr/include/bits/types/wint_t.h
- /usr/include/bits/types/mbstate_t.h
- /usr/include/bits/types/__mbstate_t.h
- /usr/include/bits/types/__FILE.h
- /usr/include/bits/types/FILE.h
- /usr/include/c++/12/cctype
- /usr/include/ctype.h
- /usr/include/bits/types.h
- /usr/include/bits/typesizes.h
- /usr/include/bits/time64.h
- /usr/include/bits/endian.h
- /usr/include/bits/endianness.h
- /usr/include/c++/12/bits/locale_classes.h
- /usr/include/c++/12/string
- /usr/include/c++/12/bits/char_traits.h
- /usr/include/c++/12/type_traits
- /usr/include/c++/12/cstdint
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stdint.h
+ /usr/include/pthread.h
+ /usr/include/sched.h
+ /usr/include/stdc-predef.h
/usr/include/stdint.h
- /usr/include/bits/stdint-intn.h
- /usr/include/bits/stdint-uintn.h
- /usr/include/c++/12/bits/allocator.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++allocator.h
- /usr/include/c++/12/bits/new_allocator.h
- /usr/include/c++/12/new
- /usr/include/c++/12/bits/exception.h
- /usr/include/c++/12/bits/functexcept.h
- /usr/include/c++/12/bits/exception_defines.h
- /usr/include/c++/12/bits/move.h
- /usr/include/c++/12/bits/cpp_type_traits.h
- /usr/include/c++/12/bits/ostream_insert.h
- /usr/include/c++/12/bits/cxxabi_forced.h
- /usr/include/c++/12/bits/stl_iterator_base_types.h
- /usr/include/c++/12/bits/stl_iterator_base_funcs.h
- /usr/include/c++/12/bits/concept_check.h
- /usr/include/c++/12/debug/assertions.h
- /usr/include/c++/12/bits/stl_iterator.h
- /usr/include/c++/12/ext/type_traits.h
- /usr/include/c++/12/bits/ptr_traits.h
- /usr/include/c++/12/bits/stl_function.h
- /usr/include/c++/12/backward/binders.h
- /usr/include/c++/12/ext/numeric_traits.h
- /usr/include/c++/12/bits/stl_algobase.h
- /usr/include/c++/12/bits/stl_pair.h
- /usr/include/c++/12/bits/utility.h
- /usr/include/c++/12/debug/debug.h
- /usr/include/c++/12/bits/predefined_ops.h
- /usr/include/c++/12/bits/refwrap.h
- /usr/include/c++/12/bits/invoke.h
- /usr/include/c++/12/bits/range_access.h
- /usr/include/c++/12/initializer_list
- /usr/include/c++/12/bits/basic_string.h
- /usr/include/c++/12/ext/alloc_traits.h
- /usr/include/c++/12/bits/alloc_traits.h
- /usr/include/c++/12/bits/stl_construct.h
- /usr/include/c++/12/ext/string_conversions.h
- /usr/include/c++/12/cstdlib
+ /usr/include/stdio.h
/usr/include/stdlib.h
- /usr/include/bits/waitflags.h
- /usr/include/bits/waitstatus.h
+ /usr/include/string.h
+ /usr/include/strings.h
+ /usr/include/sys/cdefs.h
+ /usr/include/sys/select.h
+ /usr/include/sys/single_threaded.h
/usr/include/sys/types.h
- /usr/include/bits/types/clock_t.h
- /usr/include/bits/types/clockid_t.h
- /usr/include/bits/types/time_t.h
- /usr/include/bits/types/timer_t.h
- /usr/include/endian.h
+ /usr/include/time.h
+ /usr/include/wchar.h
+ /usr/include/wctype.h
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stdarg.h
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stddef.h
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stdint.h
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/optional.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/string_view.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/config.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/detail/decode.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/detail/encode.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/detail/translate.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/detail/uri_parts.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/uri.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/uri_builder.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/uri_errors.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/algorithm.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_advance_parts.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_normalize.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_parse.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_percent_encode.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_resolve.hpp
+
+third_party/uri/src/CMakeFiles/network-uri.dir/uri_builder.cpp.o
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/uri_builder.cpp
+ /usr/include/alloca.h
+ /usr/include/asm-generic/errno-base.h
+ /usr/include/asm-generic/errno.h
+ /usr/include/asm/errno.h
+ /usr/include/assert.h
+ /usr/include/bits/atomic_wide_counter.h
/usr/include/bits/byteswap.h
- /usr/include/bits/uintn-identity.h
- /usr/include/sys/select.h
- /usr/include/bits/select.h
- /usr/include/bits/types/sigset_t.h
- /usr/include/bits/types/__sigset_t.h
- /usr/include/bits/types/struct_timeval.h
- /usr/include/bits/types/struct_timespec.h
- /usr/include/bits/pthreadtypes.h
- /usr/include/bits/thread-shared-types.h
+ /usr/include/bits/cpu-set.h
+ /usr/include/bits/endian.h
+ /usr/include/bits/endianness.h
+ /usr/include/bits/errno.h
+ /usr/include/bits/floatn-common.h
+ /usr/include/bits/floatn.h
+ /usr/include/bits/libc-header-start.h
+ /usr/include/bits/locale.h
+ /usr/include/bits/long-double.h
+ /usr/include/bits/pthread_stack_min-dynamic.h
/usr/include/bits/pthreadtypes-arch.h
- /usr/include/bits/atomic_wide_counter.h
- /usr/include/bits/struct_mutex.h
- /usr/include/bits/struct_rwlock.h
- /usr/include/alloca.h
+ /usr/include/bits/pthreadtypes.h
+ /usr/include/bits/sched.h
+ /usr/include/bits/select.h
+ /usr/include/bits/setjmp.h
+ /usr/include/bits/stdint-intn.h
+ /usr/include/bits/stdint-uintn.h
+ /usr/include/bits/stdio.h
+ /usr/include/bits/stdio_lim.h
/usr/include/bits/stdlib-bsearch.h
/usr/include/bits/stdlib-float.h
- /usr/include/c++/12/bits/std_abs.h
- /usr/include/c++/12/cstdio
- /usr/include/stdio.h
- /usr/include/bits/types/__fpos_t.h
+ /usr/include/bits/struct_mutex.h
+ /usr/include/bits/struct_rwlock.h
+ /usr/include/bits/thread-shared-types.h
+ /usr/include/bits/time.h
+ /usr/include/bits/time64.h
+ /usr/include/bits/timesize.h
+ /usr/include/bits/timex.h
+ /usr/include/bits/types.h
+ /usr/include/bits/types/FILE.h
+ /usr/include/bits/types/__FILE.h
/usr/include/bits/types/__fpos64_t.h
- /usr/include/bits/types/struct_FILE.h
+ /usr/include/bits/types/__fpos_t.h
+ /usr/include/bits/types/__locale_t.h
+ /usr/include/bits/types/__mbstate_t.h
+ /usr/include/bits/types/__sigset_t.h
+ /usr/include/bits/types/clock_t.h
+ /usr/include/bits/types/clockid_t.h
/usr/include/bits/types/cookie_io_functions_t.h
- /usr/include/bits/stdio_lim.h
- /usr/include/bits/stdio.h
- /usr/include/c++/12/cerrno
- /usr/include/errno.h
- /usr/include/bits/errno.h
- /usr/include/linux/errno.h
- /usr/include/asm/errno.h
- /usr/include/asm-generic/errno.h
- /usr/include/asm-generic/errno-base.h
/usr/include/bits/types/error_t.h
- /usr/include/c++/12/bits/charconv.h
- /usr/include/c++/12/bits/functional_hash.h
- /usr/include/c++/12/bits/hash_bytes.h
- /usr/include/c++/12/bits/basic_string.tcc
- /usr/include/c++/12/ext/atomicity.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/gthr.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/gthr-default.h
- /usr/include/pthread.h
- /usr/include/sched.h
- /usr/include/bits/sched.h
+ /usr/include/bits/types/locale_t.h
+ /usr/include/bits/types/mbstate_t.h
+ /usr/include/bits/types/sigset_t.h
+ /usr/include/bits/types/struct_FILE.h
+ /usr/include/bits/types/struct___jmp_buf_tag.h
+ /usr/include/bits/types/struct_itimerspec.h
/usr/include/bits/types/struct_sched_param.h
- /usr/include/bits/cpu-set.h
- /usr/include/time.h
- /usr/include/bits/time.h
- /usr/include/bits/timex.h
+ /usr/include/bits/types/struct_timespec.h
+ /usr/include/bits/types/struct_timeval.h
/usr/include/bits/types/struct_tm.h
- /usr/include/bits/types/struct_itimerspec.h
- /usr/include/bits/setjmp.h
- /usr/include/bits/types/struct___jmp_buf_tag.h
- /usr/include/bits/pthread_stack_min-dynamic.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/atomic_word.h
- /usr/include/sys/single_threaded.h
- /usr/include/c++/12/bits/locale_classes.tcc
- /usr/include/c++/12/bits/locale_facets.h
- /usr/include/c++/12/cwctype
- /usr/include/wctype.h
+ /usr/include/bits/types/time_t.h
+ /usr/include/bits/types/timer_t.h
+ /usr/include/bits/types/wint_t.h
+ /usr/include/bits/typesizes.h
+ /usr/include/bits/uintn-identity.h
+ /usr/include/bits/waitflags.h
+ /usr/include/bits/waitstatus.h
+ /usr/include/bits/wchar.h
/usr/include/bits/wctype-wchar.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/ctype_base.h
- /usr/include/c++/12/bits/ios_base.h
- /usr/include/c++/12/system_error
- /usr/include/c++/12/x86_64-redhat-linux/bits/error_constants.h
- /usr/include/c++/12/stdexcept
- /usr/include/c++/12/exception
- /usr/include/c++/12/bits/exception_ptr.h
- /usr/include/c++/12/bits/cxxabi_init_exception.h
- /usr/include/c++/12/typeinfo
- /usr/include/c++/12/bits/nested_exception.h
- /usr/include/c++/12/streambuf
- /usr/include/c++/12/bits/streambuf.tcc
- /usr/include/c++/12/bits/streambuf_iterator.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/ctype_inline.h
- /usr/include/c++/12/bits/locale_facets.tcc
- /usr/include/c++/12/bits/locale_facets_nonio.h
- /usr/include/c++/12/ctime
- /usr/include/c++/12/x86_64-redhat-linux/bits/time_members.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/messages_members.h
+ /usr/include/bits/wordsize.h
+ /usr/include/c++/13/algorithm
+ /usr/include/c++/13/backward/auto_ptr.h
+ /usr/include/c++/13/backward/binders.h
+ /usr/include/c++/13/bit
+ /usr/include/c++/13/bits/algorithmfwd.h
+ /usr/include/c++/13/bits/align.h
+ /usr/include/c++/13/bits/alloc_traits.h
+ /usr/include/c++/13/bits/allocated_ptr.h
+ /usr/include/c++/13/bits/allocator.h
+ /usr/include/c++/13/bits/atomic_base.h
+ /usr/include/c++/13/bits/atomic_lockfree_defines.h
+ /usr/include/c++/13/bits/basic_string.h
+ /usr/include/c++/13/bits/basic_string.tcc
+ /usr/include/c++/13/bits/char_traits.h
+ /usr/include/c++/13/bits/charconv.h
+ /usr/include/c++/13/bits/codecvt.h
+ /usr/include/c++/13/bits/concept_check.h
+ /usr/include/c++/13/bits/cpp_type_traits.h
+ /usr/include/c++/13/bits/cxxabi_forced.h
+ /usr/include/c++/13/bits/cxxabi_init_exception.h
+ /usr/include/c++/13/bits/exception.h
+ /usr/include/c++/13/bits/exception_defines.h
+ /usr/include/c++/13/bits/exception_ptr.h
+ /usr/include/c++/13/bits/functexcept.h
+ /usr/include/c++/13/bits/functional_hash.h
+ /usr/include/c++/13/bits/hash_bytes.h
+ /usr/include/c++/13/bits/invoke.h
+ /usr/include/c++/13/bits/ios_base.h
+ /usr/include/c++/13/bits/locale_classes.h
+ /usr/include/c++/13/bits/locale_classes.tcc
+ /usr/include/c++/13/bits/locale_conv.h
+ /usr/include/c++/13/bits/locale_facets.h
+ /usr/include/c++/13/bits/locale_facets.tcc
+ /usr/include/c++/13/bits/locale_facets_nonio.h
+ /usr/include/c++/13/bits/locale_facets_nonio.tcc
+ /usr/include/c++/13/bits/localefwd.h
+ /usr/include/c++/13/bits/memoryfwd.h
+ /usr/include/c++/13/bits/move.h
+ /usr/include/c++/13/bits/nested_exception.h
+ /usr/include/c++/13/bits/new_allocator.h
+ /usr/include/c++/13/bits/ostream_insert.h
+ /usr/include/c++/13/bits/postypes.h
+ /usr/include/c++/13/bits/predefined_ops.h
+ /usr/include/c++/13/bits/ptr_traits.h
+ /usr/include/c++/13/bits/range_access.h
+ /usr/include/c++/13/bits/refwrap.h
+ /usr/include/c++/13/bits/requires_hosted.h
+ /usr/include/c++/13/bits/shared_ptr.h
+ /usr/include/c++/13/bits/shared_ptr_atomic.h
+ /usr/include/c++/13/bits/shared_ptr_base.h
+ /usr/include/c++/13/bits/std_abs.h
+ /usr/include/c++/13/bits/std_function.h
+ /usr/include/c++/13/bits/stl_algo.h
+ /usr/include/c++/13/bits/stl_algobase.h
+ /usr/include/c++/13/bits/stl_construct.h
+ /usr/include/c++/13/bits/stl_function.h
+ /usr/include/c++/13/bits/stl_heap.h
+ /usr/include/c++/13/bits/stl_iterator.h
+ /usr/include/c++/13/bits/stl_iterator_base_funcs.h
+ /usr/include/c++/13/bits/stl_iterator_base_types.h
+ /usr/include/c++/13/bits/stl_pair.h
+ /usr/include/c++/13/bits/stl_raw_storage_iter.h
+ /usr/include/c++/13/bits/stl_relops.h
+ /usr/include/c++/13/bits/stl_tempbuf.h
+ /usr/include/c++/13/bits/stl_uninitialized.h
+ /usr/include/c++/13/bits/stream_iterator.h
+ /usr/include/c++/13/bits/streambuf.tcc
+ /usr/include/c++/13/bits/streambuf_iterator.h
+ /usr/include/c++/13/bits/stringfwd.h
+ /usr/include/c++/13/bits/uniform_int_dist.h
+ /usr/include/c++/13/bits/unique_ptr.h
+ /usr/include/c++/13/bits/uses_allocator.h
+ /usr/include/c++/13/bits/utility.h
+ /usr/include/c++/13/cassert
+ /usr/include/c++/13/cctype
+ /usr/include/c++/13/cerrno
+ /usr/include/c++/13/clocale
+ /usr/include/c++/13/cstdint
+ /usr/include/c++/13/cstdio
+ /usr/include/c++/13/cstdlib
+ /usr/include/c++/13/cstring
+ /usr/include/c++/13/ctime
+ /usr/include/c++/13/cwchar
+ /usr/include/c++/13/cwctype
+ /usr/include/c++/13/debug/assertions.h
+ /usr/include/c++/13/debug/debug.h
+ /usr/include/c++/13/exception
+ /usr/include/c++/13/ext/aligned_buffer.h
+ /usr/include/c++/13/ext/alloc_traits.h
+ /usr/include/c++/13/ext/atomicity.h
+ /usr/include/c++/13/ext/concurrence.h
+ /usr/include/c++/13/ext/numeric_traits.h
+ /usr/include/c++/13/ext/string_conversions.h
+ /usr/include/c++/13/ext/type_traits.h
+ /usr/include/c++/13/functional
+ /usr/include/c++/13/initializer_list
+ /usr/include/c++/13/iosfwd
+ /usr/include/c++/13/iterator
+ /usr/include/c++/13/locale
+ /usr/include/c++/13/memory
+ /usr/include/c++/13/new
+ /usr/include/c++/13/stdexcept
+ /usr/include/c++/13/streambuf
+ /usr/include/c++/13/string
+ /usr/include/c++/13/system_error
+ /usr/include/c++/13/tuple
+ /usr/include/c++/13/type_traits
+ /usr/include/c++/13/typeinfo
+ /usr/include/c++/13/utility
+ /usr/include/c++/13/x86_64-redhat-linux/bits/atomic_word.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++allocator.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++config.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++locale.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/cpu_defines.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/ctype_base.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/ctype_inline.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/error_constants.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/gthr-default.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/gthr.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/messages_members.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/os_defines.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/time_members.h
+ /usr/include/ctype.h
+ /usr/include/endian.h
+ /usr/include/errno.h
+ /usr/include/features-time64.h
+ /usr/include/features.h
+ /usr/include/gnu/stubs-64.h
+ /usr/include/gnu/stubs.h
/usr/include/libintl.h
- /usr/include/c++/12/bits/codecvt.h
- /usr/include/c++/12/bits/locale_facets_nonio.tcc
- /usr/include/c++/12/bits/locale_conv.h
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/uri_builder.hpp
- /usr/include/c++/12/utility
- /usr/include/c++/12/bits/stl_relops.h
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/uri.hpp
- /usr/include/c++/12/iterator
- /usr/include/c++/12/bits/stream_iterator.h
- /usr/include/c++/12/algorithm
- /usr/include/c++/12/bits/stl_algo.h
- /usr/include/c++/12/bits/algorithmfwd.h
- /usr/include/c++/12/bits/stl_heap.h
- /usr/include/c++/12/bits/stl_tempbuf.h
- /usr/include/c++/12/bits/uniform_int_dist.h
- /usr/include/c++/12/functional
- /usr/include/c++/12/tuple
- /usr/include/c++/12/bits/uses_allocator.h
- /usr/include/c++/12/bits/std_function.h
- /usr/include/c++/12/memory
- /usr/include/c++/12/bits/stl_uninitialized.h
- /usr/include/c++/12/bits/stl_raw_storage_iter.h
- /usr/include/c++/12/bits/align.h
- /usr/include/c++/12/bit
- /usr/include/c++/12/bits/unique_ptr.h
- /usr/include/c++/12/bits/shared_ptr.h
- /usr/include/c++/12/bits/shared_ptr_base.h
- /usr/include/c++/12/bits/allocated_ptr.h
- /usr/include/c++/12/ext/aligned_buffer.h
- /usr/include/c++/12/ext/concurrence.h
- /usr/include/c++/12/bits/shared_ptr_atomic.h
- /usr/include/c++/12/bits/atomic_base.h
- /usr/include/c++/12/bits/atomic_lockfree_defines.h
- /usr/include/c++/12/backward/auto_ptr.h
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/string_view.hpp
- /usr/include/c++/12/cassert
- /usr/include/assert.h
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/optional.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/config.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/uri_errors.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/detail/uri_parts.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/detail/encode.hpp
- /usr/include/c++/12/cstring
+ /usr/include/linux/errno.h
+ /usr/include/locale.h
+ /usr/include/pthread.h
+ /usr/include/sched.h
+ /usr/include/stdc-predef.h
+ /usr/include/stdint.h
+ /usr/include/stdio.h
+ /usr/include/stdlib.h
/usr/include/string.h
/usr/include/strings.h
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/detail/decode.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/detail/translate.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_normalize.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/uri_parse_authority.hpp
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/detail/algorithm.hpp
-
-third_party/uri/src/CMakeFiles/network-uri.dir/uri_errors.cpp.o
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/uri_errors.cpp
- /usr/include/stdc-predef.h
- /usr/include/c++/12/string
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++config.h
- /usr/include/bits/wordsize.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/os_defines.h
- /usr/include/features.h
- /usr/include/features-time64.h
- /usr/include/bits/timesize.h
/usr/include/sys/cdefs.h
- /usr/include/bits/long-double.h
- /usr/include/gnu/stubs.h
- /usr/include/gnu/stubs-64.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/cpu_defines.h
- /usr/include/c++/12/bits/stringfwd.h
- /usr/include/c++/12/bits/memoryfwd.h
- /usr/include/c++/12/bits/char_traits.h
- /usr/include/c++/12/bits/postypes.h
- /usr/include/c++/12/cwchar
+ /usr/include/sys/select.h
+ /usr/include/sys/single_threaded.h
+ /usr/include/sys/types.h
+ /usr/include/time.h
/usr/include/wchar.h
- /usr/include/bits/libc-header-start.h
- /usr/include/bits/floatn.h
+ /usr/include/wctype.h
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stdarg.h
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stddef.h
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stdint.h
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/optional.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/string_view.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/config.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/detail/decode.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/detail/encode.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/detail/translate.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/detail/uri_parts.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/uri.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/uri_builder.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/uri_errors.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/algorithm.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_normalize.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/detail/uri_parse_authority.hpp
+
+third_party/uri/src/CMakeFiles/network-uri.dir/uri_errors.cpp.o
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/uri_errors.cpp
+ /usr/include/alloca.h
+ /usr/include/asm-generic/errno-base.h
+ /usr/include/asm-generic/errno.h
+ /usr/include/asm/errno.h
+ /usr/include/bits/atomic_wide_counter.h
+ /usr/include/bits/byteswap.h
+ /usr/include/bits/endian.h
+ /usr/include/bits/endianness.h
+ /usr/include/bits/errno.h
/usr/include/bits/floatn-common.h
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stddef.h
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stdarg.h
- /usr/include/bits/wchar.h
- /usr/include/bits/types/wint_t.h
- /usr/include/bits/types/mbstate_t.h
- /usr/include/bits/types/__mbstate_t.h
- /usr/include/bits/types/__FILE.h
+ /usr/include/bits/floatn.h
+ /usr/include/bits/libc-header-start.h
+ /usr/include/bits/locale.h
+ /usr/include/bits/long-double.h
+ /usr/include/bits/pthreadtypes-arch.h
+ /usr/include/bits/pthreadtypes.h
+ /usr/include/bits/select.h
+ /usr/include/bits/stdint-intn.h
+ /usr/include/bits/stdio.h
+ /usr/include/bits/stdio_lim.h
+ /usr/include/bits/stdlib-bsearch.h
+ /usr/include/bits/stdlib-float.h
+ /usr/include/bits/struct_mutex.h
+ /usr/include/bits/struct_rwlock.h
+ /usr/include/bits/thread-shared-types.h
+ /usr/include/bits/time64.h
+ /usr/include/bits/timesize.h
+ /usr/include/bits/types.h
/usr/include/bits/types/FILE.h
- /usr/include/bits/types/locale_t.h
+ /usr/include/bits/types/__FILE.h
+ /usr/include/bits/types/__fpos64_t.h
+ /usr/include/bits/types/__fpos_t.h
/usr/include/bits/types/__locale_t.h
- /usr/include/c++/12/type_traits
- /usr/include/c++/12/cstdint
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stdint.h
- /usr/include/stdint.h
- /usr/include/bits/types.h
- /usr/include/bits/typesizes.h
- /usr/include/bits/time64.h
- /usr/include/bits/stdint-intn.h
- /usr/include/bits/stdint-uintn.h
- /usr/include/c++/12/bits/allocator.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++allocator.h
- /usr/include/c++/12/bits/new_allocator.h
- /usr/include/c++/12/new
- /usr/include/c++/12/bits/exception.h
- /usr/include/c++/12/bits/functexcept.h
- /usr/include/c++/12/bits/exception_defines.h
- /usr/include/c++/12/bits/move.h
- /usr/include/c++/12/bits/cpp_type_traits.h
- /usr/include/c++/12/bits/localefwd.h
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++locale.h
- /usr/include/c++/12/clocale
- /usr/include/locale.h
- /usr/include/bits/locale.h
- /usr/include/c++/12/iosfwd
- /usr/include/c++/12/cctype
- /usr/include/ctype.h
- /usr/include/bits/endian.h
- /usr/include/bits/endianness.h
- /usr/include/c++/12/bits/ostream_insert.h
- /usr/include/c++/12/bits/cxxabi_forced.h
- /usr/include/c++/12/bits/stl_iterator_base_types.h
- /usr/include/c++/12/bits/stl_iterator_base_funcs.h
- /usr/include/c++/12/bits/concept_check.h
- /usr/include/c++/12/debug/assertions.h
- /usr/include/c++/12/bits/stl_iterator.h
- /usr/include/c++/12/ext/type_traits.h
- /usr/include/c++/12/bits/ptr_traits.h
- /usr/include/c++/12/bits/stl_function.h
- /usr/include/c++/12/backward/binders.h
- /usr/include/c++/12/ext/numeric_traits.h
- /usr/include/c++/12/bits/stl_algobase.h
- /usr/include/c++/12/bits/stl_pair.h
- /usr/include/c++/12/bits/utility.h
- /usr/include/c++/12/debug/debug.h
- /usr/include/c++/12/bits/predefined_ops.h
- /usr/include/c++/12/bits/refwrap.h
- /usr/include/c++/12/bits/invoke.h
- /usr/include/c++/12/bits/range_access.h
- /usr/include/c++/12/initializer_list
- /usr/include/c++/12/bits/basic_string.h
- /usr/include/c++/12/ext/alloc_traits.h
- /usr/include/c++/12/bits/alloc_traits.h
- /usr/include/c++/12/bits/stl_construct.h
- /usr/include/c++/12/ext/string_conversions.h
- /usr/include/c++/12/cstdlib
- /usr/include/stdlib.h
- /usr/include/bits/waitflags.h
- /usr/include/bits/waitstatus.h
- /usr/include/sys/types.h
+ /usr/include/bits/types/__mbstate_t.h
+ /usr/include/bits/types/__sigset_t.h
/usr/include/bits/types/clock_t.h
/usr/include/bits/types/clockid_t.h
+ /usr/include/bits/types/cookie_io_functions_t.h
+ /usr/include/bits/types/error_t.h
+ /usr/include/bits/types/locale_t.h
+ /usr/include/bits/types/mbstate_t.h
+ /usr/include/bits/types/sigset_t.h
+ /usr/include/bits/types/struct_FILE.h
+ /usr/include/bits/types/struct_timespec.h
+ /usr/include/bits/types/struct_timeval.h
/usr/include/bits/types/time_t.h
/usr/include/bits/types/timer_t.h
- /usr/include/endian.h
- /usr/include/bits/byteswap.h
+ /usr/include/bits/types/wint_t.h
+ /usr/include/bits/typesizes.h
/usr/include/bits/uintn-identity.h
- /usr/include/sys/select.h
- /usr/include/bits/select.h
- /usr/include/bits/types/sigset_t.h
- /usr/include/bits/types/__sigset_t.h
- /usr/include/bits/types/struct_timeval.h
- /usr/include/bits/types/struct_timespec.h
- /usr/include/bits/pthreadtypes.h
- /usr/include/bits/thread-shared-types.h
- /usr/include/bits/pthreadtypes-arch.h
- /usr/include/bits/atomic_wide_counter.h
- /usr/include/bits/struct_mutex.h
- /usr/include/bits/struct_rwlock.h
- /usr/include/alloca.h
- /usr/include/bits/stdlib-bsearch.h
- /usr/include/bits/stdlib-float.h
- /usr/include/c++/12/bits/std_abs.h
- /usr/include/c++/12/cstdio
- /usr/include/stdio.h
- /usr/include/bits/types/__fpos_t.h
- /usr/include/bits/types/__fpos64_t.h
- /usr/include/bits/types/struct_FILE.h
- /usr/include/bits/types/cookie_io_functions_t.h
- /usr/include/bits/stdio_lim.h
- /usr/include/bits/stdio.h
- /usr/include/c++/12/cerrno
+ /usr/include/bits/waitflags.h
+ /usr/include/bits/waitstatus.h
+ /usr/include/bits/wchar.h
+ /usr/include/bits/wordsize.h
+ /usr/include/c++/13/backward/binders.h
+ /usr/include/c++/13/bits/alloc_traits.h
+ /usr/include/c++/13/bits/allocator.h
+ /usr/include/c++/13/bits/basic_string.h
+ /usr/include/c++/13/bits/basic_string.tcc
+ /usr/include/c++/13/bits/char_traits.h
+ /usr/include/c++/13/bits/charconv.h
+ /usr/include/c++/13/bits/concept_check.h
+ /usr/include/c++/13/bits/cpp_type_traits.h
+ /usr/include/c++/13/bits/cxxabi_forced.h
+ /usr/include/c++/13/bits/cxxabi_init_exception.h
+ /usr/include/c++/13/bits/exception.h
+ /usr/include/c++/13/bits/exception_defines.h
+ /usr/include/c++/13/bits/exception_ptr.h
+ /usr/include/c++/13/bits/functexcept.h
+ /usr/include/c++/13/bits/functional_hash.h
+ /usr/include/c++/13/bits/hash_bytes.h
+ /usr/include/c++/13/bits/invoke.h
+ /usr/include/c++/13/bits/localefwd.h
+ /usr/include/c++/13/bits/memoryfwd.h
+ /usr/include/c++/13/bits/move.h
+ /usr/include/c++/13/bits/nested_exception.h
+ /usr/include/c++/13/bits/new_allocator.h
+ /usr/include/c++/13/bits/ostream_insert.h
+ /usr/include/c++/13/bits/postypes.h
+ /usr/include/c++/13/bits/predefined_ops.h
+ /usr/include/c++/13/bits/ptr_traits.h
+ /usr/include/c++/13/bits/range_access.h
+ /usr/include/c++/13/bits/refwrap.h
+ /usr/include/c++/13/bits/requires_hosted.h
+ /usr/include/c++/13/bits/std_abs.h
+ /usr/include/c++/13/bits/stl_algobase.h
+ /usr/include/c++/13/bits/stl_construct.h
+ /usr/include/c++/13/bits/stl_function.h
+ /usr/include/c++/13/bits/stl_iterator.h
+ /usr/include/c++/13/bits/stl_iterator_base_funcs.h
+ /usr/include/c++/13/bits/stl_iterator_base_types.h
+ /usr/include/c++/13/bits/stl_pair.h
+ /usr/include/c++/13/bits/stringfwd.h
+ /usr/include/c++/13/bits/utility.h
+ /usr/include/c++/13/cctype
+ /usr/include/c++/13/cerrno
+ /usr/include/c++/13/clocale
+ /usr/include/c++/13/cstdio
+ /usr/include/c++/13/cstdlib
+ /usr/include/c++/13/cwchar
+ /usr/include/c++/13/debug/assertions.h
+ /usr/include/c++/13/debug/debug.h
+ /usr/include/c++/13/exception
+ /usr/include/c++/13/ext/alloc_traits.h
+ /usr/include/c++/13/ext/numeric_traits.h
+ /usr/include/c++/13/ext/string_conversions.h
+ /usr/include/c++/13/ext/type_traits.h
+ /usr/include/c++/13/initializer_list
+ /usr/include/c++/13/iosfwd
+ /usr/include/c++/13/new
+ /usr/include/c++/13/stdexcept
+ /usr/include/c++/13/string
+ /usr/include/c++/13/system_error
+ /usr/include/c++/13/type_traits
+ /usr/include/c++/13/typeinfo
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++allocator.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++config.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++locale.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/cpu_defines.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/error_constants.h
+ /usr/include/c++/13/x86_64-redhat-linux/bits/os_defines.h
+ /usr/include/ctype.h
+ /usr/include/endian.h
/usr/include/errno.h
- /usr/include/bits/errno.h
+ /usr/include/features-time64.h
+ /usr/include/features.h
+ /usr/include/gnu/stubs-64.h
+ /usr/include/gnu/stubs.h
/usr/include/linux/errno.h
- /usr/include/asm/errno.h
- /usr/include/asm-generic/errno.h
- /usr/include/asm-generic/errno-base.h
- /usr/include/bits/types/error_t.h
- /usr/include/c++/12/bits/charconv.h
- /usr/include/c++/12/bits/functional_hash.h
- /usr/include/c++/12/bits/hash_bytes.h
- /usr/include/c++/12/bits/basic_string.tcc
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/uri_errors.hpp
- /usr/include/c++/12/system_error
- /usr/include/c++/12/x86_64-redhat-linux/bits/error_constants.h
- /usr/include/c++/12/stdexcept
- /usr/include/c++/12/exception
- /usr/include/c++/12/bits/exception_ptr.h
- /usr/include/c++/12/bits/cxxabi_init_exception.h
- /usr/include/c++/12/typeinfo
- /usr/include/c++/12/bits/nested_exception.h
- /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include/network/uri/config.hpp
+ /usr/include/locale.h
+ /usr/include/stdc-predef.h
+ /usr/include/stdio.h
+ /usr/include/stdlib.h
+ /usr/include/sys/cdefs.h
+ /usr/include/sys/select.h
+ /usr/include/sys/types.h
+ /usr/include/wchar.h
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stdarg.h
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stddef.h
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/config.hpp
+ /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include/network/uri/uri_errors.hpp
diff --git a/Build/source/utils/asymptote/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/compiler_depend.make b/Build/source/utils/asymptote/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/compiler_depend.make
index d8013e34c38..095ca0a14b9 100644
--- a/Build/source/utils/asymptote/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/compiler_depend.make
+++ b/Build/source/utils/asymptote/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/compiler_depend.make
@@ -1,1717 +1,1718 @@
# CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.25
+# Generated by "Unix Makefiles" Generator, CMake Version 3.27
third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.o: third_party/uri/src/detail/uri_advance_parts.cpp \
- /usr/include/stdc-predef.h \
- third_party/uri/src/detail/uri_advance_parts.hpp \
- third_party/uri/include/network/uri/detail/uri_parts.hpp \
- /usr/include/c++/12/string \
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++config.h \
- /usr/include/bits/wordsize.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/os_defines.h \
- /usr/include/features.h \
- /usr/include/features-time64.h \
- /usr/include/bits/timesize.h \
- /usr/include/sys/cdefs.h \
- /usr/include/bits/long-double.h \
- /usr/include/gnu/stubs.h \
- /usr/include/gnu/stubs-64.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/cpu_defines.h \
- /usr/include/c++/12/bits/stringfwd.h \
- /usr/include/c++/12/bits/memoryfwd.h \
- /usr/include/c++/12/bits/char_traits.h \
- /usr/include/c++/12/bits/postypes.h \
- /usr/include/c++/12/cwchar \
- /usr/include/wchar.h \
- /usr/include/bits/libc-header-start.h \
- /usr/include/bits/floatn.h \
+ /usr/include/alloca.h \
+ /usr/include/asm-generic/errno-base.h \
+ /usr/include/asm-generic/errno.h \
+ /usr/include/asm/errno.h \
+ /usr/include/assert.h \
+ /usr/include/bits/atomic_wide_counter.h \
+ /usr/include/bits/byteswap.h \
+ /usr/include/bits/cpu-set.h \
+ /usr/include/bits/endian.h \
+ /usr/include/bits/endianness.h \
+ /usr/include/bits/errno.h \
/usr/include/bits/floatn-common.h \
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stddef.h \
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stdarg.h \
- /usr/include/bits/wchar.h \
- /usr/include/bits/types/wint_t.h \
- /usr/include/bits/types/mbstate_t.h \
- /usr/include/bits/types/__mbstate_t.h \
- /usr/include/bits/types/__FILE.h \
- /usr/include/bits/types/FILE.h \
- /usr/include/bits/types/locale_t.h \
- /usr/include/bits/types/__locale_t.h \
- /usr/include/c++/12/type_traits \
- /usr/include/c++/12/cstdint \
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stdint.h \
- /usr/include/stdint.h \
- /usr/include/bits/types.h \
- /usr/include/bits/typesizes.h \
- /usr/include/bits/time64.h \
+ /usr/include/bits/floatn.h \
+ /usr/include/bits/libc-header-start.h \
+ /usr/include/bits/locale.h \
+ /usr/include/bits/long-double.h \
+ /usr/include/bits/pthread_stack_min-dynamic.h \
+ /usr/include/bits/pthreadtypes-arch.h \
+ /usr/include/bits/pthreadtypes.h \
+ /usr/include/bits/sched.h \
+ /usr/include/bits/select.h \
+ /usr/include/bits/setjmp.h \
/usr/include/bits/stdint-intn.h \
/usr/include/bits/stdint-uintn.h \
- /usr/include/c++/12/bits/allocator.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++allocator.h \
- /usr/include/c++/12/bits/new_allocator.h \
- /usr/include/c++/12/new \
- /usr/include/c++/12/bits/exception.h \
- /usr/include/c++/12/bits/functexcept.h \
- /usr/include/c++/12/bits/exception_defines.h \
- /usr/include/c++/12/bits/move.h \
- /usr/include/c++/12/bits/cpp_type_traits.h \
- /usr/include/c++/12/bits/localefwd.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++locale.h \
- /usr/include/c++/12/clocale \
- /usr/include/locale.h \
- /usr/include/bits/locale.h \
- /usr/include/c++/12/iosfwd \
- /usr/include/c++/12/cctype \
- /usr/include/ctype.h \
- /usr/include/bits/endian.h \
- /usr/include/bits/endianness.h \
- /usr/include/c++/12/bits/ostream_insert.h \
- /usr/include/c++/12/bits/cxxabi_forced.h \
- /usr/include/c++/12/bits/stl_iterator_base_types.h \
- /usr/include/c++/12/bits/stl_iterator_base_funcs.h \
- /usr/include/c++/12/bits/concept_check.h \
- /usr/include/c++/12/debug/assertions.h \
- /usr/include/c++/12/bits/stl_iterator.h \
- /usr/include/c++/12/ext/type_traits.h \
- /usr/include/c++/12/bits/ptr_traits.h \
- /usr/include/c++/12/bits/stl_function.h \
- /usr/include/c++/12/backward/binders.h \
- /usr/include/c++/12/ext/numeric_traits.h \
- /usr/include/c++/12/bits/stl_algobase.h \
- /usr/include/c++/12/bits/stl_pair.h \
- /usr/include/c++/12/bits/utility.h \
- /usr/include/c++/12/debug/debug.h \
- /usr/include/c++/12/bits/predefined_ops.h \
- /usr/include/c++/12/bits/refwrap.h \
- /usr/include/c++/12/bits/invoke.h \
- /usr/include/c++/12/bits/range_access.h \
- /usr/include/c++/12/initializer_list \
- /usr/include/c++/12/bits/basic_string.h \
- /usr/include/c++/12/ext/alloc_traits.h \
- /usr/include/c++/12/bits/alloc_traits.h \
- /usr/include/c++/12/bits/stl_construct.h \
- /usr/include/c++/12/ext/string_conversions.h \
- /usr/include/c++/12/cstdlib \
- /usr/include/stdlib.h \
- /usr/include/bits/waitflags.h \
- /usr/include/bits/waitstatus.h \
- /usr/include/sys/types.h \
+ /usr/include/bits/stdio.h \
+ /usr/include/bits/stdio_lim.h \
+ /usr/include/bits/stdlib-bsearch.h \
+ /usr/include/bits/stdlib-float.h \
+ /usr/include/bits/struct_mutex.h \
+ /usr/include/bits/struct_rwlock.h \
+ /usr/include/bits/thread-shared-types.h \
+ /usr/include/bits/time.h \
+ /usr/include/bits/time64.h \
+ /usr/include/bits/timesize.h \
+ /usr/include/bits/timex.h \
+ /usr/include/bits/types.h \
+ /usr/include/bits/types/FILE.h \
+ /usr/include/bits/types/__FILE.h \
+ /usr/include/bits/types/__fpos64_t.h \
+ /usr/include/bits/types/__fpos_t.h \
+ /usr/include/bits/types/__locale_t.h \
+ /usr/include/bits/types/__mbstate_t.h \
+ /usr/include/bits/types/__sigset_t.h \
/usr/include/bits/types/clock_t.h \
/usr/include/bits/types/clockid_t.h \
+ /usr/include/bits/types/cookie_io_functions_t.h \
+ /usr/include/bits/types/error_t.h \
+ /usr/include/bits/types/locale_t.h \
+ /usr/include/bits/types/mbstate_t.h \
+ /usr/include/bits/types/sigset_t.h \
+ /usr/include/bits/types/struct_FILE.h \
+ /usr/include/bits/types/struct___jmp_buf_tag.h \
+ /usr/include/bits/types/struct_itimerspec.h \
+ /usr/include/bits/types/struct_sched_param.h \
+ /usr/include/bits/types/struct_timespec.h \
+ /usr/include/bits/types/struct_timeval.h \
+ /usr/include/bits/types/struct_tm.h \
/usr/include/bits/types/time_t.h \
/usr/include/bits/types/timer_t.h \
- /usr/include/endian.h \
- /usr/include/bits/byteswap.h \
+ /usr/include/bits/types/wint_t.h \
+ /usr/include/bits/typesizes.h \
/usr/include/bits/uintn-identity.h \
- /usr/include/sys/select.h \
- /usr/include/bits/select.h \
- /usr/include/bits/types/sigset_t.h \
- /usr/include/bits/types/__sigset_t.h \
- /usr/include/bits/types/struct_timeval.h \
- /usr/include/bits/types/struct_timespec.h \
- /usr/include/bits/pthreadtypes.h \
- /usr/include/bits/thread-shared-types.h \
- /usr/include/bits/pthreadtypes-arch.h \
- /usr/include/bits/atomic_wide_counter.h \
- /usr/include/bits/struct_mutex.h \
- /usr/include/bits/struct_rwlock.h \
- /usr/include/alloca.h \
- /usr/include/bits/stdlib-bsearch.h \
- /usr/include/bits/stdlib-float.h \
- /usr/include/c++/12/bits/std_abs.h \
- /usr/include/c++/12/cstdio \
- /usr/include/stdio.h \
- /usr/include/bits/types/__fpos_t.h \
- /usr/include/bits/types/__fpos64_t.h \
- /usr/include/bits/types/struct_FILE.h \
- /usr/include/bits/types/cookie_io_functions_t.h \
- /usr/include/bits/stdio_lim.h \
- /usr/include/bits/stdio.h \
- /usr/include/c++/12/cerrno \
+ /usr/include/bits/waitflags.h \
+ /usr/include/bits/waitstatus.h \
+ /usr/include/bits/wchar.h \
+ /usr/include/bits/wordsize.h \
+ /usr/include/c++/13/algorithm \
+ /usr/include/c++/13/backward/auto_ptr.h \
+ /usr/include/c++/13/backward/binders.h \
+ /usr/include/c++/13/bit \
+ /usr/include/c++/13/bits/algorithmfwd.h \
+ /usr/include/c++/13/bits/align.h \
+ /usr/include/c++/13/bits/alloc_traits.h \
+ /usr/include/c++/13/bits/allocated_ptr.h \
+ /usr/include/c++/13/bits/allocator.h \
+ /usr/include/c++/13/bits/atomic_base.h \
+ /usr/include/c++/13/bits/atomic_lockfree_defines.h \
+ /usr/include/c++/13/bits/basic_string.h \
+ /usr/include/c++/13/bits/basic_string.tcc \
+ /usr/include/c++/13/bits/char_traits.h \
+ /usr/include/c++/13/bits/charconv.h \
+ /usr/include/c++/13/bits/concept_check.h \
+ /usr/include/c++/13/bits/cpp_type_traits.h \
+ /usr/include/c++/13/bits/cxxabi_forced.h \
+ /usr/include/c++/13/bits/cxxabi_init_exception.h \
+ /usr/include/c++/13/bits/exception.h \
+ /usr/include/c++/13/bits/exception_defines.h \
+ /usr/include/c++/13/bits/exception_ptr.h \
+ /usr/include/c++/13/bits/functexcept.h \
+ /usr/include/c++/13/bits/functional_hash.h \
+ /usr/include/c++/13/bits/hash_bytes.h \
+ /usr/include/c++/13/bits/invoke.h \
+ /usr/include/c++/13/bits/ios_base.h \
+ /usr/include/c++/13/bits/locale_classes.h \
+ /usr/include/c++/13/bits/locale_classes.tcc \
+ /usr/include/c++/13/bits/localefwd.h \
+ /usr/include/c++/13/bits/memoryfwd.h \
+ /usr/include/c++/13/bits/move.h \
+ /usr/include/c++/13/bits/nested_exception.h \
+ /usr/include/c++/13/bits/new_allocator.h \
+ /usr/include/c++/13/bits/ostream_insert.h \
+ /usr/include/c++/13/bits/postypes.h \
+ /usr/include/c++/13/bits/predefined_ops.h \
+ /usr/include/c++/13/bits/ptr_traits.h \
+ /usr/include/c++/13/bits/range_access.h \
+ /usr/include/c++/13/bits/refwrap.h \
+ /usr/include/c++/13/bits/requires_hosted.h \
+ /usr/include/c++/13/bits/shared_ptr.h \
+ /usr/include/c++/13/bits/shared_ptr_atomic.h \
+ /usr/include/c++/13/bits/shared_ptr_base.h \
+ /usr/include/c++/13/bits/std_abs.h \
+ /usr/include/c++/13/bits/stl_algo.h \
+ /usr/include/c++/13/bits/stl_algobase.h \
+ /usr/include/c++/13/bits/stl_construct.h \
+ /usr/include/c++/13/bits/stl_function.h \
+ /usr/include/c++/13/bits/stl_heap.h \
+ /usr/include/c++/13/bits/stl_iterator.h \
+ /usr/include/c++/13/bits/stl_iterator_base_funcs.h \
+ /usr/include/c++/13/bits/stl_iterator_base_types.h \
+ /usr/include/c++/13/bits/stl_pair.h \
+ /usr/include/c++/13/bits/stl_raw_storage_iter.h \
+ /usr/include/c++/13/bits/stl_relops.h \
+ /usr/include/c++/13/bits/stl_tempbuf.h \
+ /usr/include/c++/13/bits/stl_uninitialized.h \
+ /usr/include/c++/13/bits/stream_iterator.h \
+ /usr/include/c++/13/bits/streambuf.tcc \
+ /usr/include/c++/13/bits/streambuf_iterator.h \
+ /usr/include/c++/13/bits/stringfwd.h \
+ /usr/include/c++/13/bits/uniform_int_dist.h \
+ /usr/include/c++/13/bits/unique_ptr.h \
+ /usr/include/c++/13/bits/uses_allocator.h \
+ /usr/include/c++/13/bits/utility.h \
+ /usr/include/c++/13/cassert \
+ /usr/include/c++/13/cctype \
+ /usr/include/c++/13/cerrno \
+ /usr/include/c++/13/clocale \
+ /usr/include/c++/13/cstdio \
+ /usr/include/c++/13/cstdlib \
+ /usr/include/c++/13/cwchar \
+ /usr/include/c++/13/debug/assertions.h \
+ /usr/include/c++/13/debug/debug.h \
+ /usr/include/c++/13/exception \
+ /usr/include/c++/13/ext/aligned_buffer.h \
+ /usr/include/c++/13/ext/alloc_traits.h \
+ /usr/include/c++/13/ext/atomicity.h \
+ /usr/include/c++/13/ext/concurrence.h \
+ /usr/include/c++/13/ext/numeric_traits.h \
+ /usr/include/c++/13/ext/string_conversions.h \
+ /usr/include/c++/13/ext/type_traits.h \
+ /usr/include/c++/13/initializer_list \
+ /usr/include/c++/13/iosfwd \
+ /usr/include/c++/13/iterator \
+ /usr/include/c++/13/limits \
+ /usr/include/c++/13/memory \
+ /usr/include/c++/13/new \
+ /usr/include/c++/13/stdexcept \
+ /usr/include/c++/13/streambuf \
+ /usr/include/c++/13/string \
+ /usr/include/c++/13/system_error \
+ /usr/include/c++/13/tuple \
+ /usr/include/c++/13/type_traits \
+ /usr/include/c++/13/typeinfo \
+ /usr/include/c++/13/utility \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/atomic_word.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++allocator.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++config.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++locale.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/cpu_defines.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/error_constants.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/gthr-default.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/gthr.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/os_defines.h \
+ /usr/include/ctype.h \
+ /usr/include/endian.h \
/usr/include/errno.h \
- /usr/include/bits/errno.h \
+ /usr/include/features-time64.h \
+ /usr/include/features.h \
+ /usr/include/gnu/stubs-64.h \
+ /usr/include/gnu/stubs.h \
/usr/include/linux/errno.h \
- /usr/include/asm/errno.h \
- /usr/include/asm-generic/errno.h \
- /usr/include/asm-generic/errno-base.h \
- /usr/include/bits/types/error_t.h \
- /usr/include/c++/12/bits/charconv.h \
- /usr/include/c++/12/bits/functional_hash.h \
- /usr/include/c++/12/bits/hash_bytes.h \
- /usr/include/c++/12/bits/basic_string.tcc \
- /usr/include/c++/12/utility \
- /usr/include/c++/12/bits/stl_relops.h \
- /usr/include/c++/12/iterator \
- /usr/include/c++/12/bits/stream_iterator.h \
- /usr/include/c++/12/bits/streambuf_iterator.h \
- /usr/include/c++/12/streambuf \
- /usr/include/c++/12/bits/ios_base.h \
- /usr/include/c++/12/ext/atomicity.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/gthr.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/gthr-default.h \
+ /usr/include/locale.h \
/usr/include/pthread.h \
/usr/include/sched.h \
- /usr/include/bits/sched.h \
- /usr/include/bits/types/struct_sched_param.h \
- /usr/include/bits/cpu-set.h \
- /usr/include/time.h \
- /usr/include/bits/time.h \
- /usr/include/bits/timex.h \
- /usr/include/bits/types/struct_tm.h \
- /usr/include/bits/types/struct_itimerspec.h \
- /usr/include/bits/setjmp.h \
- /usr/include/bits/types/struct___jmp_buf_tag.h \
- /usr/include/bits/pthread_stack_min-dynamic.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/atomic_word.h \
+ /usr/include/stdc-predef.h \
+ /usr/include/stdint.h \
+ /usr/include/stdio.h \
+ /usr/include/stdlib.h \
+ /usr/include/sys/cdefs.h \
+ /usr/include/sys/select.h \
/usr/include/sys/single_threaded.h \
- /usr/include/c++/12/bits/locale_classes.h \
- /usr/include/c++/12/bits/locale_classes.tcc \
- /usr/include/c++/12/system_error \
- /usr/include/c++/12/x86_64-redhat-linux/bits/error_constants.h \
- /usr/include/c++/12/stdexcept \
- /usr/include/c++/12/exception \
- /usr/include/c++/12/bits/exception_ptr.h \
- /usr/include/c++/12/bits/cxxabi_init_exception.h \
- /usr/include/c++/12/typeinfo \
- /usr/include/c++/12/bits/nested_exception.h \
- /usr/include/c++/12/bits/streambuf.tcc \
+ /usr/include/sys/types.h \
+ /usr/include/time.h \
+ /usr/include/wchar.h \
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stdarg.h \
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stddef.h \
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stdint.h \
third_party/uri/include/network/optional.hpp \
- /usr/include/c++/12/memory \
- /usr/include/c++/12/bits/stl_uninitialized.h \
- /usr/include/c++/12/bits/stl_tempbuf.h \
- /usr/include/c++/12/bits/stl_raw_storage_iter.h \
- /usr/include/c++/12/bits/align.h \
- /usr/include/c++/12/bit \
- /usr/include/c++/12/bits/uses_allocator.h \
- /usr/include/c++/12/bits/unique_ptr.h \
- /usr/include/c++/12/tuple \
- /usr/include/c++/12/bits/shared_ptr.h \
- /usr/include/c++/12/bits/shared_ptr_base.h \
- /usr/include/c++/12/bits/allocated_ptr.h \
- /usr/include/c++/12/ext/aligned_buffer.h \
- /usr/include/c++/12/ext/concurrence.h \
- /usr/include/c++/12/bits/shared_ptr_atomic.h \
- /usr/include/c++/12/bits/atomic_base.h \
- /usr/include/c++/12/bits/atomic_lockfree_defines.h \
- /usr/include/c++/12/backward/auto_ptr.h \
- /usr/include/c++/12/algorithm \
- /usr/include/c++/12/bits/stl_algo.h \
- /usr/include/c++/12/bits/algorithmfwd.h \
- /usr/include/c++/12/bits/stl_heap.h \
- /usr/include/c++/12/bits/uniform_int_dist.h \
third_party/uri/include/network/string_view.hpp \
- /usr/include/c++/12/cassert \
- /usr/include/assert.h \
- /usr/include/c++/12/limits
+ third_party/uri/include/network/uri/detail/uri_parts.hpp \
+ third_party/uri/src/detail/uri_advance_parts.hpp
third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.o: third_party/uri/src/detail/uri_normalize.cpp \
- /usr/include/stdc-predef.h \
- third_party/uri/src/detail/uri_normalize.hpp \
- third_party/uri/include/network/uri/uri.hpp \
- /usr/include/c++/12/iterator \
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++config.h \
- /usr/include/bits/wordsize.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/os_defines.h \
- /usr/include/features.h \
- /usr/include/features-time64.h \
- /usr/include/bits/timesize.h \
- /usr/include/sys/cdefs.h \
- /usr/include/bits/long-double.h \
- /usr/include/gnu/stubs.h \
- /usr/include/gnu/stubs-64.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/cpu_defines.h \
- /usr/include/c++/12/bits/stl_iterator_base_types.h \
- /usr/include/c++/12/type_traits \
- /usr/include/c++/12/bits/stl_iterator_base_funcs.h \
- /usr/include/c++/12/bits/concept_check.h \
- /usr/include/c++/12/debug/assertions.h \
- /usr/include/c++/12/bits/stl_iterator.h \
- /usr/include/c++/12/bits/cpp_type_traits.h \
- /usr/include/c++/12/ext/type_traits.h \
- /usr/include/c++/12/bits/move.h \
- /usr/include/c++/12/bits/ptr_traits.h \
- /usr/include/c++/12/iosfwd \
- /usr/include/c++/12/bits/stringfwd.h \
- /usr/include/c++/12/bits/memoryfwd.h \
- /usr/include/c++/12/bits/postypes.h \
- /usr/include/c++/12/cwchar \
- /usr/include/wchar.h \
- /usr/include/bits/libc-header-start.h \
- /usr/include/bits/floatn.h \
- /usr/include/bits/floatn-common.h \
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stddef.h \
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stdarg.h \
- /usr/include/bits/wchar.h \
- /usr/include/bits/types/wint_t.h \
- /usr/include/bits/types/mbstate_t.h \
- /usr/include/bits/types/__mbstate_t.h \
- /usr/include/bits/types/__FILE.h \
- /usr/include/bits/types/FILE.h \
- /usr/include/bits/types/locale_t.h \
- /usr/include/bits/types/__locale_t.h \
- /usr/include/c++/12/bits/stream_iterator.h \
- /usr/include/c++/12/debug/debug.h \
- /usr/include/c++/12/bits/streambuf_iterator.h \
- /usr/include/c++/12/streambuf \
- /usr/include/c++/12/bits/localefwd.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++locale.h \
- /usr/include/c++/12/clocale \
- /usr/include/locale.h \
- /usr/include/bits/locale.h \
- /usr/include/c++/12/cctype \
- /usr/include/ctype.h \
- /usr/include/bits/types.h \
- /usr/include/bits/typesizes.h \
- /usr/include/bits/time64.h \
+ /usr/include/alloca.h \
+ /usr/include/asm-generic/errno-base.h \
+ /usr/include/asm-generic/errno.h \
+ /usr/include/asm/errno.h \
+ /usr/include/assert.h \
+ /usr/include/bits/atomic_wide_counter.h \
+ /usr/include/bits/byteswap.h \
+ /usr/include/bits/cpu-set.h \
/usr/include/bits/endian.h \
/usr/include/bits/endianness.h \
- /usr/include/c++/12/bits/ios_base.h \
- /usr/include/c++/12/ext/atomicity.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/gthr.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/gthr-default.h \
- /usr/include/pthread.h \
- /usr/include/sched.h \
- /usr/include/bits/types/time_t.h \
- /usr/include/bits/types/struct_timespec.h \
+ /usr/include/bits/errno.h \
+ /usr/include/bits/floatn-common.h \
+ /usr/include/bits/floatn.h \
+ /usr/include/bits/libc-header-start.h \
+ /usr/include/bits/locale.h \
+ /usr/include/bits/long-double.h \
+ /usr/include/bits/pthread_stack_min-dynamic.h \
+ /usr/include/bits/pthreadtypes-arch.h \
+ /usr/include/bits/pthreadtypes.h \
/usr/include/bits/sched.h \
- /usr/include/bits/types/struct_sched_param.h \
- /usr/include/bits/cpu-set.h \
- /usr/include/time.h \
+ /usr/include/bits/select.h \
+ /usr/include/bits/setjmp.h \
+ /usr/include/bits/stdint-intn.h \
+ /usr/include/bits/stdint-uintn.h \
+ /usr/include/bits/stdio.h \
+ /usr/include/bits/stdio_lim.h \
+ /usr/include/bits/stdlib-bsearch.h \
+ /usr/include/bits/stdlib-float.h \
+ /usr/include/bits/struct_mutex.h \
+ /usr/include/bits/struct_rwlock.h \
+ /usr/include/bits/thread-shared-types.h \
/usr/include/bits/time.h \
+ /usr/include/bits/time64.h \
+ /usr/include/bits/timesize.h \
/usr/include/bits/timex.h \
- /usr/include/bits/types/struct_timeval.h \
+ /usr/include/bits/types.h \
+ /usr/include/bits/types/FILE.h \
+ /usr/include/bits/types/__FILE.h \
+ /usr/include/bits/types/__fpos64_t.h \
+ /usr/include/bits/types/__fpos_t.h \
+ /usr/include/bits/types/__locale_t.h \
+ /usr/include/bits/types/__mbstate_t.h \
+ /usr/include/bits/types/__sigset_t.h \
/usr/include/bits/types/clock_t.h \
- /usr/include/bits/types/struct_tm.h \
/usr/include/bits/types/clockid_t.h \
- /usr/include/bits/types/timer_t.h \
- /usr/include/bits/types/struct_itimerspec.h \
- /usr/include/bits/pthreadtypes.h \
- /usr/include/bits/thread-shared-types.h \
- /usr/include/bits/pthreadtypes-arch.h \
- /usr/include/bits/atomic_wide_counter.h \
- /usr/include/bits/struct_mutex.h \
- /usr/include/bits/struct_rwlock.h \
- /usr/include/bits/setjmp.h \
- /usr/include/bits/types/__sigset_t.h \
+ /usr/include/bits/types/cookie_io_functions_t.h \
+ /usr/include/bits/types/error_t.h \
+ /usr/include/bits/types/locale_t.h \
+ /usr/include/bits/types/mbstate_t.h \
+ /usr/include/bits/types/sigset_t.h \
+ /usr/include/bits/types/struct_FILE.h \
/usr/include/bits/types/struct___jmp_buf_tag.h \
- /usr/include/bits/pthread_stack_min-dynamic.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/atomic_word.h \
- /usr/include/sys/single_threaded.h \
- /usr/include/c++/12/bits/locale_classes.h \
- /usr/include/c++/12/string \
- /usr/include/c++/12/bits/char_traits.h \
- /usr/include/c++/12/cstdint \
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stdint.h \
- /usr/include/stdint.h \
- /usr/include/bits/stdint-intn.h \
- /usr/include/bits/stdint-uintn.h \
- /usr/include/c++/12/bits/allocator.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++allocator.h \
- /usr/include/c++/12/bits/new_allocator.h \
- /usr/include/c++/12/new \
- /usr/include/c++/12/bits/exception.h \
- /usr/include/c++/12/bits/functexcept.h \
- /usr/include/c++/12/bits/exception_defines.h \
- /usr/include/c++/12/bits/ostream_insert.h \
- /usr/include/c++/12/bits/cxxabi_forced.h \
- /usr/include/c++/12/bits/stl_function.h \
- /usr/include/c++/12/backward/binders.h \
- /usr/include/c++/12/ext/numeric_traits.h \
- /usr/include/c++/12/bits/stl_algobase.h \
- /usr/include/c++/12/bits/stl_pair.h \
- /usr/include/c++/12/bits/utility.h \
- /usr/include/c++/12/bits/predefined_ops.h \
- /usr/include/c++/12/bits/refwrap.h \
- /usr/include/c++/12/bits/invoke.h \
- /usr/include/c++/12/bits/range_access.h \
- /usr/include/c++/12/initializer_list \
- /usr/include/c++/12/bits/basic_string.h \
- /usr/include/c++/12/ext/alloc_traits.h \
- /usr/include/c++/12/bits/alloc_traits.h \
- /usr/include/c++/12/bits/stl_construct.h \
- /usr/include/c++/12/ext/string_conversions.h \
- /usr/include/c++/12/cstdlib \
- /usr/include/stdlib.h \
+ /usr/include/bits/types/struct_itimerspec.h \
+ /usr/include/bits/types/struct_sched_param.h \
+ /usr/include/bits/types/struct_timespec.h \
+ /usr/include/bits/types/struct_timeval.h \
+ /usr/include/bits/types/struct_tm.h \
+ /usr/include/bits/types/time_t.h \
+ /usr/include/bits/types/timer_t.h \
+ /usr/include/bits/types/wint_t.h \
+ /usr/include/bits/typesizes.h \
+ /usr/include/bits/uintn-identity.h \
/usr/include/bits/waitflags.h \
/usr/include/bits/waitstatus.h \
- /usr/include/sys/types.h \
+ /usr/include/bits/wchar.h \
+ /usr/include/bits/wctype-wchar.h \
+ /usr/include/bits/wordsize.h \
+ /usr/include/c++/13/algorithm \
+ /usr/include/c++/13/backward/auto_ptr.h \
+ /usr/include/c++/13/backward/binders.h \
+ /usr/include/c++/13/bit \
+ /usr/include/c++/13/bits/algorithmfwd.h \
+ /usr/include/c++/13/bits/align.h \
+ /usr/include/c++/13/bits/alloc_traits.h \
+ /usr/include/c++/13/bits/allocated_ptr.h \
+ /usr/include/c++/13/bits/allocator.h \
+ /usr/include/c++/13/bits/atomic_base.h \
+ /usr/include/c++/13/bits/atomic_lockfree_defines.h \
+ /usr/include/c++/13/bits/basic_string.h \
+ /usr/include/c++/13/bits/basic_string.tcc \
+ /usr/include/c++/13/bits/char_traits.h \
+ /usr/include/c++/13/bits/charconv.h \
+ /usr/include/c++/13/bits/codecvt.h \
+ /usr/include/c++/13/bits/concept_check.h \
+ /usr/include/c++/13/bits/cpp_type_traits.h \
+ /usr/include/c++/13/bits/cxxabi_forced.h \
+ /usr/include/c++/13/bits/cxxabi_init_exception.h \
+ /usr/include/c++/13/bits/exception.h \
+ /usr/include/c++/13/bits/exception_defines.h \
+ /usr/include/c++/13/bits/exception_ptr.h \
+ /usr/include/c++/13/bits/functexcept.h \
+ /usr/include/c++/13/bits/functional_hash.h \
+ /usr/include/c++/13/bits/hash_bytes.h \
+ /usr/include/c++/13/bits/invoke.h \
+ /usr/include/c++/13/bits/ios_base.h \
+ /usr/include/c++/13/bits/locale_classes.h \
+ /usr/include/c++/13/bits/locale_classes.tcc \
+ /usr/include/c++/13/bits/locale_conv.h \
+ /usr/include/c++/13/bits/locale_facets.h \
+ /usr/include/c++/13/bits/locale_facets.tcc \
+ /usr/include/c++/13/bits/locale_facets_nonio.h \
+ /usr/include/c++/13/bits/locale_facets_nonio.tcc \
+ /usr/include/c++/13/bits/localefwd.h \
+ /usr/include/c++/13/bits/memoryfwd.h \
+ /usr/include/c++/13/bits/move.h \
+ /usr/include/c++/13/bits/nested_exception.h \
+ /usr/include/c++/13/bits/new_allocator.h \
+ /usr/include/c++/13/bits/ostream_insert.h \
+ /usr/include/c++/13/bits/postypes.h \
+ /usr/include/c++/13/bits/predefined_ops.h \
+ /usr/include/c++/13/bits/ptr_traits.h \
+ /usr/include/c++/13/bits/range_access.h \
+ /usr/include/c++/13/bits/refwrap.h \
+ /usr/include/c++/13/bits/requires_hosted.h \
+ /usr/include/c++/13/bits/shared_ptr.h \
+ /usr/include/c++/13/bits/shared_ptr_atomic.h \
+ /usr/include/c++/13/bits/shared_ptr_base.h \
+ /usr/include/c++/13/bits/std_abs.h \
+ /usr/include/c++/13/bits/std_function.h \
+ /usr/include/c++/13/bits/stl_algo.h \
+ /usr/include/c++/13/bits/stl_algobase.h \
+ /usr/include/c++/13/bits/stl_bvector.h \
+ /usr/include/c++/13/bits/stl_construct.h \
+ /usr/include/c++/13/bits/stl_function.h \
+ /usr/include/c++/13/bits/stl_heap.h \
+ /usr/include/c++/13/bits/stl_iterator.h \
+ /usr/include/c++/13/bits/stl_iterator_base_funcs.h \
+ /usr/include/c++/13/bits/stl_iterator_base_types.h \
+ /usr/include/c++/13/bits/stl_pair.h \
+ /usr/include/c++/13/bits/stl_raw_storage_iter.h \
+ /usr/include/c++/13/bits/stl_relops.h \
+ /usr/include/c++/13/bits/stl_tempbuf.h \
+ /usr/include/c++/13/bits/stl_uninitialized.h \
+ /usr/include/c++/13/bits/stl_vector.h \
+ /usr/include/c++/13/bits/stream_iterator.h \
+ /usr/include/c++/13/bits/streambuf.tcc \
+ /usr/include/c++/13/bits/streambuf_iterator.h \
+ /usr/include/c++/13/bits/stringfwd.h \
+ /usr/include/c++/13/bits/uniform_int_dist.h \
+ /usr/include/c++/13/bits/unique_ptr.h \
+ /usr/include/c++/13/bits/uses_allocator.h \
+ /usr/include/c++/13/bits/utility.h \
+ /usr/include/c++/13/bits/vector.tcc \
+ /usr/include/c++/13/cassert \
+ /usr/include/c++/13/cctype \
+ /usr/include/c++/13/cerrno \
+ /usr/include/c++/13/clocale \
+ /usr/include/c++/13/cstdint \
+ /usr/include/c++/13/cstdio \
+ /usr/include/c++/13/cstdlib \
+ /usr/include/c++/13/cstring \
+ /usr/include/c++/13/ctime \
+ /usr/include/c++/13/cwchar \
+ /usr/include/c++/13/cwctype \
+ /usr/include/c++/13/debug/assertions.h \
+ /usr/include/c++/13/debug/debug.h \
+ /usr/include/c++/13/exception \
+ /usr/include/c++/13/ext/aligned_buffer.h \
+ /usr/include/c++/13/ext/alloc_traits.h \
+ /usr/include/c++/13/ext/atomicity.h \
+ /usr/include/c++/13/ext/concurrence.h \
+ /usr/include/c++/13/ext/numeric_traits.h \
+ /usr/include/c++/13/ext/string_conversions.h \
+ /usr/include/c++/13/ext/type_traits.h \
+ /usr/include/c++/13/functional \
+ /usr/include/c++/13/initializer_list \
+ /usr/include/c++/13/iosfwd \
+ /usr/include/c++/13/iterator \
+ /usr/include/c++/13/locale \
+ /usr/include/c++/13/memory \
+ /usr/include/c++/13/new \
+ /usr/include/c++/13/stdexcept \
+ /usr/include/c++/13/streambuf \
+ /usr/include/c++/13/string \
+ /usr/include/c++/13/system_error \
+ /usr/include/c++/13/tuple \
+ /usr/include/c++/13/type_traits \
+ /usr/include/c++/13/typeinfo \
+ /usr/include/c++/13/utility \
+ /usr/include/c++/13/vector \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/atomic_word.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++allocator.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++config.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++locale.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/cpu_defines.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/ctype_base.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/ctype_inline.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/error_constants.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/gthr-default.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/gthr.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/messages_members.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/os_defines.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/time_members.h \
+ /usr/include/ctype.h \
/usr/include/endian.h \
- /usr/include/bits/byteswap.h \
- /usr/include/bits/uintn-identity.h \
- /usr/include/sys/select.h \
- /usr/include/bits/select.h \
- /usr/include/bits/types/sigset_t.h \
- /usr/include/alloca.h \
- /usr/include/bits/stdlib-bsearch.h \
- /usr/include/bits/stdlib-float.h \
- /usr/include/c++/12/bits/std_abs.h \
- /usr/include/c++/12/cstdio \
- /usr/include/stdio.h \
- /usr/include/bits/types/__fpos_t.h \
- /usr/include/bits/types/__fpos64_t.h \
- /usr/include/bits/types/struct_FILE.h \
- /usr/include/bits/types/cookie_io_functions_t.h \
- /usr/include/bits/stdio_lim.h \
- /usr/include/bits/stdio.h \
- /usr/include/c++/12/cerrno \
/usr/include/errno.h \
- /usr/include/bits/errno.h \
+ /usr/include/features-time64.h \
+ /usr/include/features.h \
+ /usr/include/gnu/stubs-64.h \
+ /usr/include/gnu/stubs.h \
+ /usr/include/libintl.h \
/usr/include/linux/errno.h \
- /usr/include/asm/errno.h \
- /usr/include/asm-generic/errno.h \
- /usr/include/asm-generic/errno-base.h \
- /usr/include/bits/types/error_t.h \
- /usr/include/c++/12/bits/charconv.h \
- /usr/include/c++/12/bits/functional_hash.h \
- /usr/include/c++/12/bits/hash_bytes.h \
- /usr/include/c++/12/bits/basic_string.tcc \
- /usr/include/c++/12/bits/locale_classes.tcc \
- /usr/include/c++/12/system_error \
- /usr/include/c++/12/x86_64-redhat-linux/bits/error_constants.h \
- /usr/include/c++/12/stdexcept \
- /usr/include/c++/12/exception \
- /usr/include/c++/12/bits/exception_ptr.h \
- /usr/include/c++/12/bits/cxxabi_init_exception.h \
- /usr/include/c++/12/typeinfo \
- /usr/include/c++/12/bits/nested_exception.h \
- /usr/include/c++/12/bits/streambuf.tcc \
- /usr/include/c++/12/algorithm \
- /usr/include/c++/12/bits/stl_algo.h \
- /usr/include/c++/12/bits/algorithmfwd.h \
- /usr/include/c++/12/bits/stl_heap.h \
- /usr/include/c++/12/bits/stl_tempbuf.h \
- /usr/include/c++/12/bits/uniform_int_dist.h \
- /usr/include/c++/12/functional \
- /usr/include/c++/12/tuple \
- /usr/include/c++/12/bits/uses_allocator.h \
- /usr/include/c++/12/bits/std_function.h \
- /usr/include/c++/12/memory \
- /usr/include/c++/12/bits/stl_uninitialized.h \
- /usr/include/c++/12/bits/stl_raw_storage_iter.h \
- /usr/include/c++/12/bits/align.h \
- /usr/include/c++/12/bit \
- /usr/include/c++/12/bits/unique_ptr.h \
- /usr/include/c++/12/bits/shared_ptr.h \
- /usr/include/c++/12/bits/shared_ptr_base.h \
- /usr/include/c++/12/bits/allocated_ptr.h \
- /usr/include/c++/12/ext/aligned_buffer.h \
- /usr/include/c++/12/ext/concurrence.h \
- /usr/include/c++/12/bits/shared_ptr_atomic.h \
- /usr/include/c++/12/bits/atomic_base.h \
- /usr/include/c++/12/bits/atomic_lockfree_defines.h \
- /usr/include/c++/12/backward/auto_ptr.h \
- third_party/uri/include/network/string_view.hpp \
- /usr/include/c++/12/cassert \
- /usr/include/assert.h \
- third_party/uri/include/network/optional.hpp \
- /usr/include/c++/12/utility \
- /usr/include/c++/12/bits/stl_relops.h \
- third_party/uri/include/network/uri/config.hpp \
- third_party/uri/include/network/uri/uri_errors.hpp \
- third_party/uri/include/network/uri/detail/uri_parts.hpp \
- third_party/uri/include/network/uri/detail/encode.hpp \
- /usr/include/c++/12/cstring \
+ /usr/include/locale.h \
+ /usr/include/pthread.h \
+ /usr/include/sched.h \
+ /usr/include/stdc-predef.h \
+ /usr/include/stdint.h \
+ /usr/include/stdio.h \
+ /usr/include/stdlib.h \
/usr/include/string.h \
/usr/include/strings.h \
+ /usr/include/sys/cdefs.h \
+ /usr/include/sys/select.h \
+ /usr/include/sys/single_threaded.h \
+ /usr/include/sys/types.h \
+ /usr/include/time.h \
+ /usr/include/wchar.h \
+ /usr/include/wctype.h \
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stdarg.h \
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stddef.h \
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stdint.h \
+ third_party/uri/include/network/optional.hpp \
+ third_party/uri/include/network/string_view.hpp \
+ third_party/uri/include/network/uri/config.hpp \
third_party/uri/include/network/uri/detail/decode.hpp \
+ third_party/uri/include/network/uri/detail/encode.hpp \
third_party/uri/include/network/uri/detail/translate.hpp \
+ third_party/uri/include/network/uri/detail/uri_parts.hpp \
+ third_party/uri/include/network/uri/uri.hpp \
third_party/uri/include/network/uri/uri_builder.hpp \
- third_party/uri/src/detail/uri_percent_encode.hpp \
- /usr/include/c++/12/vector \
- /usr/include/c++/12/bits/stl_vector.h \
- /usr/include/c++/12/bits/stl_bvector.h \
- /usr/include/c++/12/bits/vector.tcc \
- /usr/include/c++/12/locale \
- /usr/include/c++/12/bits/locale_facets.h \
- /usr/include/c++/12/cwctype \
- /usr/include/wctype.h \
- /usr/include/bits/wctype-wchar.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/ctype_base.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/ctype_inline.h \
- /usr/include/c++/12/bits/locale_facets.tcc \
- /usr/include/c++/12/bits/locale_facets_nonio.h \
- /usr/include/c++/12/ctime \
- /usr/include/c++/12/x86_64-redhat-linux/bits/time_members.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/messages_members.h \
- /usr/include/libintl.h \
- /usr/include/c++/12/bits/codecvt.h \
- /usr/include/c++/12/bits/locale_facets_nonio.tcc \
- /usr/include/c++/12/bits/locale_conv.h \
+ third_party/uri/include/network/uri/uri_errors.hpp \
third_party/uri/src/detail/algorithm.hpp \
- third_party/uri/src/detail/algorithm_split.hpp
+ third_party/uri/src/detail/algorithm_split.hpp \
+ third_party/uri/src/detail/uri_normalize.hpp \
+ third_party/uri/src/detail/uri_percent_encode.hpp
third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse.cpp.o: third_party/uri/src/detail/uri_parse.cpp \
- /usr/include/stdc-predef.h \
- third_party/uri/src/detail/uri_parse.hpp \
- third_party/uri/include/network/string_view.hpp \
- /usr/include/c++/12/string \
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++config.h \
- /usr/include/bits/wordsize.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/os_defines.h \
- /usr/include/features.h \
- /usr/include/features-time64.h \
- /usr/include/bits/timesize.h \
- /usr/include/sys/cdefs.h \
- /usr/include/bits/long-double.h \
- /usr/include/gnu/stubs.h \
- /usr/include/gnu/stubs-64.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/cpu_defines.h \
- /usr/include/c++/12/bits/stringfwd.h \
- /usr/include/c++/12/bits/memoryfwd.h \
- /usr/include/c++/12/bits/char_traits.h \
- /usr/include/c++/12/bits/postypes.h \
- /usr/include/c++/12/cwchar \
- /usr/include/wchar.h \
- /usr/include/bits/libc-header-start.h \
- /usr/include/bits/floatn.h \
- /usr/include/bits/floatn-common.h \
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stddef.h \
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stdarg.h \
- /usr/include/bits/wchar.h \
- /usr/include/bits/types/wint_t.h \
- /usr/include/bits/types/mbstate_t.h \
- /usr/include/bits/types/__mbstate_t.h \
- /usr/include/bits/types/__FILE.h \
- /usr/include/bits/types/FILE.h \
- /usr/include/bits/types/locale_t.h \
- /usr/include/bits/types/__locale_t.h \
- /usr/include/c++/12/type_traits \
- /usr/include/c++/12/cstdint \
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stdint.h \
- /usr/include/stdint.h \
- /usr/include/bits/types.h \
- /usr/include/bits/typesizes.h \
- /usr/include/bits/time64.h \
- /usr/include/bits/stdint-intn.h \
- /usr/include/bits/stdint-uintn.h \
- /usr/include/c++/12/bits/allocator.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++allocator.h \
- /usr/include/c++/12/bits/new_allocator.h \
- /usr/include/c++/12/new \
- /usr/include/c++/12/bits/exception.h \
- /usr/include/c++/12/bits/functexcept.h \
- /usr/include/c++/12/bits/exception_defines.h \
- /usr/include/c++/12/bits/move.h \
- /usr/include/c++/12/bits/cpp_type_traits.h \
- /usr/include/c++/12/bits/localefwd.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++locale.h \
- /usr/include/c++/12/clocale \
- /usr/include/locale.h \
- /usr/include/bits/locale.h \
- /usr/include/c++/12/iosfwd \
- /usr/include/c++/12/cctype \
- /usr/include/ctype.h \
+ /usr/include/alloca.h \
+ /usr/include/asm-generic/errno-base.h \
+ /usr/include/asm-generic/errno.h \
+ /usr/include/asm/errno.h \
+ /usr/include/assert.h \
+ /usr/include/bits/atomic_wide_counter.h \
+ /usr/include/bits/byteswap.h \
+ /usr/include/bits/cpu-set.h \
/usr/include/bits/endian.h \
/usr/include/bits/endianness.h \
- /usr/include/c++/12/bits/ostream_insert.h \
- /usr/include/c++/12/bits/cxxabi_forced.h \
- /usr/include/c++/12/bits/stl_iterator_base_types.h \
- /usr/include/c++/12/bits/stl_iterator_base_funcs.h \
- /usr/include/c++/12/bits/concept_check.h \
- /usr/include/c++/12/debug/assertions.h \
- /usr/include/c++/12/bits/stl_iterator.h \
- /usr/include/c++/12/ext/type_traits.h \
- /usr/include/c++/12/bits/ptr_traits.h \
- /usr/include/c++/12/bits/stl_function.h \
- /usr/include/c++/12/backward/binders.h \
- /usr/include/c++/12/ext/numeric_traits.h \
- /usr/include/c++/12/bits/stl_algobase.h \
- /usr/include/c++/12/bits/stl_pair.h \
- /usr/include/c++/12/bits/utility.h \
- /usr/include/c++/12/debug/debug.h \
- /usr/include/c++/12/bits/predefined_ops.h \
- /usr/include/c++/12/bits/refwrap.h \
- /usr/include/c++/12/bits/invoke.h \
- /usr/include/c++/12/bits/range_access.h \
- /usr/include/c++/12/initializer_list \
- /usr/include/c++/12/bits/basic_string.h \
- /usr/include/c++/12/ext/alloc_traits.h \
- /usr/include/c++/12/bits/alloc_traits.h \
- /usr/include/c++/12/bits/stl_construct.h \
- /usr/include/c++/12/ext/string_conversions.h \
- /usr/include/c++/12/cstdlib \
- /usr/include/stdlib.h \
- /usr/include/bits/waitflags.h \
- /usr/include/bits/waitstatus.h \
- /usr/include/sys/types.h \
- /usr/include/bits/types/clock_t.h \
- /usr/include/bits/types/clockid_t.h \
- /usr/include/bits/types/time_t.h \
- /usr/include/bits/types/timer_t.h \
- /usr/include/endian.h \
- /usr/include/bits/byteswap.h \
- /usr/include/bits/uintn-identity.h \
- /usr/include/sys/select.h \
- /usr/include/bits/select.h \
- /usr/include/bits/types/sigset_t.h \
- /usr/include/bits/types/__sigset_t.h \
- /usr/include/bits/types/struct_timeval.h \
- /usr/include/bits/types/struct_timespec.h \
- /usr/include/bits/pthreadtypes.h \
- /usr/include/bits/thread-shared-types.h \
+ /usr/include/bits/errno.h \
+ /usr/include/bits/floatn-common.h \
+ /usr/include/bits/floatn.h \
+ /usr/include/bits/libc-header-start.h \
+ /usr/include/bits/locale.h \
+ /usr/include/bits/long-double.h \
+ /usr/include/bits/pthread_stack_min-dynamic.h \
/usr/include/bits/pthreadtypes-arch.h \
- /usr/include/bits/atomic_wide_counter.h \
- /usr/include/bits/struct_mutex.h \
- /usr/include/bits/struct_rwlock.h \
- /usr/include/alloca.h \
+ /usr/include/bits/pthreadtypes.h \
+ /usr/include/bits/sched.h \
+ /usr/include/bits/select.h \
+ /usr/include/bits/setjmp.h \
+ /usr/include/bits/stdint-intn.h \
+ /usr/include/bits/stdint-uintn.h \
+ /usr/include/bits/stdio.h \
+ /usr/include/bits/stdio_lim.h \
/usr/include/bits/stdlib-bsearch.h \
/usr/include/bits/stdlib-float.h \
- /usr/include/c++/12/bits/std_abs.h \
- /usr/include/c++/12/cstdio \
- /usr/include/stdio.h \
- /usr/include/bits/types/__fpos_t.h \
+ /usr/include/bits/struct_mutex.h \
+ /usr/include/bits/struct_rwlock.h \
+ /usr/include/bits/thread-shared-types.h \
+ /usr/include/bits/time.h \
+ /usr/include/bits/time64.h \
+ /usr/include/bits/timesize.h \
+ /usr/include/bits/timex.h \
+ /usr/include/bits/types.h \
+ /usr/include/bits/types/FILE.h \
+ /usr/include/bits/types/__FILE.h \
/usr/include/bits/types/__fpos64_t.h \
- /usr/include/bits/types/struct_FILE.h \
+ /usr/include/bits/types/__fpos_t.h \
+ /usr/include/bits/types/__locale_t.h \
+ /usr/include/bits/types/__mbstate_t.h \
+ /usr/include/bits/types/__sigset_t.h \
+ /usr/include/bits/types/clock_t.h \
+ /usr/include/bits/types/clockid_t.h \
/usr/include/bits/types/cookie_io_functions_t.h \
- /usr/include/bits/stdio_lim.h \
- /usr/include/bits/stdio.h \
- /usr/include/c++/12/cerrno \
- /usr/include/errno.h \
- /usr/include/bits/errno.h \
- /usr/include/linux/errno.h \
- /usr/include/asm/errno.h \
- /usr/include/asm-generic/errno.h \
- /usr/include/asm-generic/errno-base.h \
/usr/include/bits/types/error_t.h \
- /usr/include/c++/12/bits/charconv.h \
- /usr/include/c++/12/bits/functional_hash.h \
- /usr/include/c++/12/bits/hash_bytes.h \
- /usr/include/c++/12/bits/basic_string.tcc \
- /usr/include/c++/12/iterator \
- /usr/include/c++/12/bits/stream_iterator.h \
- /usr/include/c++/12/bits/streambuf_iterator.h \
- /usr/include/c++/12/streambuf \
- /usr/include/c++/12/bits/ios_base.h \
- /usr/include/c++/12/ext/atomicity.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/gthr.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/gthr-default.h \
- /usr/include/pthread.h \
- /usr/include/sched.h \
- /usr/include/bits/sched.h \
+ /usr/include/bits/types/locale_t.h \
+ /usr/include/bits/types/mbstate_t.h \
+ /usr/include/bits/types/sigset_t.h \
+ /usr/include/bits/types/struct_FILE.h \
+ /usr/include/bits/types/struct___jmp_buf_tag.h \
+ /usr/include/bits/types/struct_itimerspec.h \
/usr/include/bits/types/struct_sched_param.h \
- /usr/include/bits/cpu-set.h \
- /usr/include/time.h \
- /usr/include/bits/time.h \
- /usr/include/bits/timex.h \
+ /usr/include/bits/types/struct_timespec.h \
+ /usr/include/bits/types/struct_timeval.h \
/usr/include/bits/types/struct_tm.h \
- /usr/include/bits/types/struct_itimerspec.h \
- /usr/include/bits/setjmp.h \
- /usr/include/bits/types/struct___jmp_buf_tag.h \
- /usr/include/bits/pthread_stack_min-dynamic.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/atomic_word.h \
- /usr/include/sys/single_threaded.h \
- /usr/include/c++/12/bits/locale_classes.h \
- /usr/include/c++/12/bits/locale_classes.tcc \
- /usr/include/c++/12/system_error \
- /usr/include/c++/12/x86_64-redhat-linux/bits/error_constants.h \
- /usr/include/c++/12/stdexcept \
- /usr/include/c++/12/exception \
- /usr/include/c++/12/bits/exception_ptr.h \
- /usr/include/c++/12/bits/cxxabi_init_exception.h \
- /usr/include/c++/12/typeinfo \
- /usr/include/c++/12/bits/nested_exception.h \
- /usr/include/c++/12/bits/streambuf.tcc \
- /usr/include/c++/12/cassert \
- /usr/include/assert.h \
- /usr/include/c++/12/algorithm \
- /usr/include/c++/12/bits/stl_algo.h \
- /usr/include/c++/12/bits/algorithmfwd.h \
- /usr/include/c++/12/bits/stl_heap.h \
- /usr/include/c++/12/bits/stl_tempbuf.h \
- /usr/include/c++/12/bits/uniform_int_dist.h \
- /usr/include/c++/12/limits \
- third_party/uri/src/detail/grammar.hpp \
- /usr/include/c++/12/locale \
- /usr/include/c++/12/bits/locale_facets.h \
- /usr/include/c++/12/cwctype \
- /usr/include/wctype.h \
+ /usr/include/bits/types/time_t.h \
+ /usr/include/bits/types/timer_t.h \
+ /usr/include/bits/types/wint_t.h \
+ /usr/include/bits/typesizes.h \
+ /usr/include/bits/uintn-identity.h \
+ /usr/include/bits/waitflags.h \
+ /usr/include/bits/waitstatus.h \
+ /usr/include/bits/wchar.h \
/usr/include/bits/wctype-wchar.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/ctype_base.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/ctype_inline.h \
- /usr/include/c++/12/bits/locale_facets.tcc \
- /usr/include/c++/12/bits/locale_facets_nonio.h \
- /usr/include/c++/12/ctime \
- /usr/include/c++/12/x86_64-redhat-linux/bits/time_members.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/messages_members.h \
+ /usr/include/bits/wordsize.h \
+ /usr/include/c++/13/algorithm \
+ /usr/include/c++/13/backward/auto_ptr.h \
+ /usr/include/c++/13/backward/binders.h \
+ /usr/include/c++/13/bit \
+ /usr/include/c++/13/bits/algorithmfwd.h \
+ /usr/include/c++/13/bits/align.h \
+ /usr/include/c++/13/bits/alloc_traits.h \
+ /usr/include/c++/13/bits/allocated_ptr.h \
+ /usr/include/c++/13/bits/allocator.h \
+ /usr/include/c++/13/bits/atomic_base.h \
+ /usr/include/c++/13/bits/atomic_lockfree_defines.h \
+ /usr/include/c++/13/bits/basic_string.h \
+ /usr/include/c++/13/bits/basic_string.tcc \
+ /usr/include/c++/13/bits/char_traits.h \
+ /usr/include/c++/13/bits/charconv.h \
+ /usr/include/c++/13/bits/codecvt.h \
+ /usr/include/c++/13/bits/concept_check.h \
+ /usr/include/c++/13/bits/cpp_type_traits.h \
+ /usr/include/c++/13/bits/cxxabi_forced.h \
+ /usr/include/c++/13/bits/cxxabi_init_exception.h \
+ /usr/include/c++/13/bits/exception.h \
+ /usr/include/c++/13/bits/exception_defines.h \
+ /usr/include/c++/13/bits/exception_ptr.h \
+ /usr/include/c++/13/bits/functexcept.h \
+ /usr/include/c++/13/bits/functional_hash.h \
+ /usr/include/c++/13/bits/hash_bytes.h \
+ /usr/include/c++/13/bits/invoke.h \
+ /usr/include/c++/13/bits/ios_base.h \
+ /usr/include/c++/13/bits/locale_classes.h \
+ /usr/include/c++/13/bits/locale_classes.tcc \
+ /usr/include/c++/13/bits/locale_conv.h \
+ /usr/include/c++/13/bits/locale_facets.h \
+ /usr/include/c++/13/bits/locale_facets.tcc \
+ /usr/include/c++/13/bits/locale_facets_nonio.h \
+ /usr/include/c++/13/bits/locale_facets_nonio.tcc \
+ /usr/include/c++/13/bits/localefwd.h \
+ /usr/include/c++/13/bits/memoryfwd.h \
+ /usr/include/c++/13/bits/move.h \
+ /usr/include/c++/13/bits/nested_exception.h \
+ /usr/include/c++/13/bits/new_allocator.h \
+ /usr/include/c++/13/bits/ostream_insert.h \
+ /usr/include/c++/13/bits/postypes.h \
+ /usr/include/c++/13/bits/predefined_ops.h \
+ /usr/include/c++/13/bits/ptr_traits.h \
+ /usr/include/c++/13/bits/range_access.h \
+ /usr/include/c++/13/bits/refwrap.h \
+ /usr/include/c++/13/bits/requires_hosted.h \
+ /usr/include/c++/13/bits/shared_ptr.h \
+ /usr/include/c++/13/bits/shared_ptr_atomic.h \
+ /usr/include/c++/13/bits/shared_ptr_base.h \
+ /usr/include/c++/13/bits/std_abs.h \
+ /usr/include/c++/13/bits/stl_algo.h \
+ /usr/include/c++/13/bits/stl_algobase.h \
+ /usr/include/c++/13/bits/stl_construct.h \
+ /usr/include/c++/13/bits/stl_function.h \
+ /usr/include/c++/13/bits/stl_heap.h \
+ /usr/include/c++/13/bits/stl_iterator.h \
+ /usr/include/c++/13/bits/stl_iterator_base_funcs.h \
+ /usr/include/c++/13/bits/stl_iterator_base_types.h \
+ /usr/include/c++/13/bits/stl_pair.h \
+ /usr/include/c++/13/bits/stl_raw_storage_iter.h \
+ /usr/include/c++/13/bits/stl_relops.h \
+ /usr/include/c++/13/bits/stl_tempbuf.h \
+ /usr/include/c++/13/bits/stl_uninitialized.h \
+ /usr/include/c++/13/bits/stream_iterator.h \
+ /usr/include/c++/13/bits/streambuf.tcc \
+ /usr/include/c++/13/bits/streambuf_iterator.h \
+ /usr/include/c++/13/bits/stringfwd.h \
+ /usr/include/c++/13/bits/uniform_int_dist.h \
+ /usr/include/c++/13/bits/unique_ptr.h \
+ /usr/include/c++/13/bits/uses_allocator.h \
+ /usr/include/c++/13/bits/utility.h \
+ /usr/include/c++/13/cassert \
+ /usr/include/c++/13/cctype \
+ /usr/include/c++/13/cerrno \
+ /usr/include/c++/13/clocale \
+ /usr/include/c++/13/cstdio \
+ /usr/include/c++/13/cstdlib \
+ /usr/include/c++/13/cstring \
+ /usr/include/c++/13/ctime \
+ /usr/include/c++/13/cwchar \
+ /usr/include/c++/13/cwctype \
+ /usr/include/c++/13/debug/assertions.h \
+ /usr/include/c++/13/debug/debug.h \
+ /usr/include/c++/13/exception \
+ /usr/include/c++/13/ext/aligned_buffer.h \
+ /usr/include/c++/13/ext/alloc_traits.h \
+ /usr/include/c++/13/ext/atomicity.h \
+ /usr/include/c++/13/ext/concurrence.h \
+ /usr/include/c++/13/ext/numeric_traits.h \
+ /usr/include/c++/13/ext/string_conversions.h \
+ /usr/include/c++/13/ext/type_traits.h \
+ /usr/include/c++/13/initializer_list \
+ /usr/include/c++/13/iosfwd \
+ /usr/include/c++/13/iterator \
+ /usr/include/c++/13/limits \
+ /usr/include/c++/13/locale \
+ /usr/include/c++/13/memory \
+ /usr/include/c++/13/new \
+ /usr/include/c++/13/stdexcept \
+ /usr/include/c++/13/streambuf \
+ /usr/include/c++/13/string \
+ /usr/include/c++/13/system_error \
+ /usr/include/c++/13/tuple \
+ /usr/include/c++/13/type_traits \
+ /usr/include/c++/13/typeinfo \
+ /usr/include/c++/13/utility \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/atomic_word.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++allocator.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++config.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++locale.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/cpu_defines.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/ctype_base.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/ctype_inline.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/error_constants.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/gthr-default.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/gthr.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/messages_members.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/os_defines.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/time_members.h \
+ /usr/include/ctype.h \
+ /usr/include/endian.h \
+ /usr/include/errno.h \
+ /usr/include/features-time64.h \
+ /usr/include/features.h \
+ /usr/include/gnu/stubs-64.h \
+ /usr/include/gnu/stubs.h \
/usr/include/libintl.h \
- /usr/include/c++/12/bits/codecvt.h \
- /usr/include/c++/12/bits/locale_facets_nonio.tcc \
- /usr/include/c++/12/bits/locale_conv.h \
- /usr/include/c++/12/cstring \
+ /usr/include/linux/errno.h \
+ /usr/include/locale.h \
+ /usr/include/pthread.h \
+ /usr/include/sched.h \
+ /usr/include/stdc-predef.h \
+ /usr/include/stdint.h \
+ /usr/include/stdio.h \
+ /usr/include/stdlib.h \
/usr/include/string.h \
/usr/include/strings.h \
- third_party/uri/include/network/uri/detail/uri_parts.hpp \
- /usr/include/c++/12/utility \
- /usr/include/c++/12/bits/stl_relops.h \
+ /usr/include/sys/cdefs.h \
+ /usr/include/sys/select.h \
+ /usr/include/sys/single_threaded.h \
+ /usr/include/sys/types.h \
+ /usr/include/time.h \
+ /usr/include/wchar.h \
+ /usr/include/wctype.h \
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stdarg.h \
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stddef.h \
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stdint.h \
third_party/uri/include/network/optional.hpp \
- /usr/include/c++/12/memory \
- /usr/include/c++/12/bits/stl_uninitialized.h \
- /usr/include/c++/12/bits/stl_raw_storage_iter.h \
- /usr/include/c++/12/bits/align.h \
- /usr/include/c++/12/bit \
- /usr/include/c++/12/bits/uses_allocator.h \
- /usr/include/c++/12/bits/unique_ptr.h \
- /usr/include/c++/12/tuple \
- /usr/include/c++/12/bits/shared_ptr.h \
- /usr/include/c++/12/bits/shared_ptr_base.h \
- /usr/include/c++/12/bits/allocated_ptr.h \
- /usr/include/c++/12/ext/aligned_buffer.h \
- /usr/include/c++/12/ext/concurrence.h \
- /usr/include/c++/12/bits/shared_ptr_atomic.h \
- /usr/include/c++/12/bits/atomic_base.h \
- /usr/include/c++/12/bits/atomic_lockfree_defines.h \
- /usr/include/c++/12/backward/auto_ptr.h
+ third_party/uri/include/network/string_view.hpp \
+ third_party/uri/include/network/uri/detail/uri_parts.hpp \
+ third_party/uri/src/detail/grammar.hpp \
+ third_party/uri/src/detail/uri_parse.hpp
third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.o: third_party/uri/src/detail/uri_parse_authority.cpp \
- /usr/include/stdc-predef.h \
- third_party/uri/src/detail/uri_parse_authority.hpp \
- third_party/uri/include/network/uri/detail/uri_parts.hpp \
- /usr/include/c++/12/string \
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++config.h \
- /usr/include/bits/wordsize.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/os_defines.h \
- /usr/include/features.h \
- /usr/include/features-time64.h \
- /usr/include/bits/timesize.h \
- /usr/include/sys/cdefs.h \
- /usr/include/bits/long-double.h \
- /usr/include/gnu/stubs.h \
- /usr/include/gnu/stubs-64.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/cpu_defines.h \
- /usr/include/c++/12/bits/stringfwd.h \
- /usr/include/c++/12/bits/memoryfwd.h \
- /usr/include/c++/12/bits/char_traits.h \
- /usr/include/c++/12/bits/postypes.h \
- /usr/include/c++/12/cwchar \
- /usr/include/wchar.h \
- /usr/include/bits/libc-header-start.h \
- /usr/include/bits/floatn.h \
+ /usr/include/alloca.h \
+ /usr/include/asm-generic/errno-base.h \
+ /usr/include/asm-generic/errno.h \
+ /usr/include/asm/errno.h \
+ /usr/include/assert.h \
+ /usr/include/bits/atomic_wide_counter.h \
+ /usr/include/bits/byteswap.h \
+ /usr/include/bits/cpu-set.h \
+ /usr/include/bits/endian.h \
+ /usr/include/bits/endianness.h \
+ /usr/include/bits/errno.h \
/usr/include/bits/floatn-common.h \
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stddef.h \
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stdarg.h \
- /usr/include/bits/wchar.h \
- /usr/include/bits/types/wint_t.h \
- /usr/include/bits/types/mbstate_t.h \
- /usr/include/bits/types/__mbstate_t.h \
- /usr/include/bits/types/__FILE.h \
- /usr/include/bits/types/FILE.h \
- /usr/include/bits/types/locale_t.h \
- /usr/include/bits/types/__locale_t.h \
- /usr/include/c++/12/type_traits \
- /usr/include/c++/12/cstdint \
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stdint.h \
- /usr/include/stdint.h \
- /usr/include/bits/types.h \
- /usr/include/bits/typesizes.h \
- /usr/include/bits/time64.h \
+ /usr/include/bits/floatn.h \
+ /usr/include/bits/libc-header-start.h \
+ /usr/include/bits/locale.h \
+ /usr/include/bits/long-double.h \
+ /usr/include/bits/pthread_stack_min-dynamic.h \
+ /usr/include/bits/pthreadtypes-arch.h \
+ /usr/include/bits/pthreadtypes.h \
+ /usr/include/bits/sched.h \
+ /usr/include/bits/select.h \
+ /usr/include/bits/setjmp.h \
/usr/include/bits/stdint-intn.h \
/usr/include/bits/stdint-uintn.h \
- /usr/include/c++/12/bits/allocator.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++allocator.h \
- /usr/include/c++/12/bits/new_allocator.h \
- /usr/include/c++/12/new \
- /usr/include/c++/12/bits/exception.h \
- /usr/include/c++/12/bits/functexcept.h \
- /usr/include/c++/12/bits/exception_defines.h \
- /usr/include/c++/12/bits/move.h \
- /usr/include/c++/12/bits/cpp_type_traits.h \
- /usr/include/c++/12/bits/localefwd.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++locale.h \
- /usr/include/c++/12/clocale \
- /usr/include/locale.h \
- /usr/include/bits/locale.h \
- /usr/include/c++/12/iosfwd \
- /usr/include/c++/12/cctype \
- /usr/include/ctype.h \
- /usr/include/bits/endian.h \
- /usr/include/bits/endianness.h \
- /usr/include/c++/12/bits/ostream_insert.h \
- /usr/include/c++/12/bits/cxxabi_forced.h \
- /usr/include/c++/12/bits/stl_iterator_base_types.h \
- /usr/include/c++/12/bits/stl_iterator_base_funcs.h \
- /usr/include/c++/12/bits/concept_check.h \
- /usr/include/c++/12/debug/assertions.h \
- /usr/include/c++/12/bits/stl_iterator.h \
- /usr/include/c++/12/ext/type_traits.h \
- /usr/include/c++/12/bits/ptr_traits.h \
- /usr/include/c++/12/bits/stl_function.h \
- /usr/include/c++/12/backward/binders.h \
- /usr/include/c++/12/ext/numeric_traits.h \
- /usr/include/c++/12/bits/stl_algobase.h \
- /usr/include/c++/12/bits/stl_pair.h \
- /usr/include/c++/12/bits/utility.h \
- /usr/include/c++/12/debug/debug.h \
- /usr/include/c++/12/bits/predefined_ops.h \
- /usr/include/c++/12/bits/refwrap.h \
- /usr/include/c++/12/bits/invoke.h \
- /usr/include/c++/12/bits/range_access.h \
- /usr/include/c++/12/initializer_list \
- /usr/include/c++/12/bits/basic_string.h \
- /usr/include/c++/12/ext/alloc_traits.h \
- /usr/include/c++/12/bits/alloc_traits.h \
- /usr/include/c++/12/bits/stl_construct.h \
- /usr/include/c++/12/ext/string_conversions.h \
- /usr/include/c++/12/cstdlib \
- /usr/include/stdlib.h \
- /usr/include/bits/waitflags.h \
- /usr/include/bits/waitstatus.h \
- /usr/include/sys/types.h \
+ /usr/include/bits/stdio.h \
+ /usr/include/bits/stdio_lim.h \
+ /usr/include/bits/stdlib-bsearch.h \
+ /usr/include/bits/stdlib-float.h \
+ /usr/include/bits/struct_mutex.h \
+ /usr/include/bits/struct_rwlock.h \
+ /usr/include/bits/thread-shared-types.h \
+ /usr/include/bits/time.h \
+ /usr/include/bits/time64.h \
+ /usr/include/bits/timesize.h \
+ /usr/include/bits/timex.h \
+ /usr/include/bits/types.h \
+ /usr/include/bits/types/FILE.h \
+ /usr/include/bits/types/__FILE.h \
+ /usr/include/bits/types/__fpos64_t.h \
+ /usr/include/bits/types/__fpos_t.h \
+ /usr/include/bits/types/__locale_t.h \
+ /usr/include/bits/types/__mbstate_t.h \
+ /usr/include/bits/types/__sigset_t.h \
/usr/include/bits/types/clock_t.h \
/usr/include/bits/types/clockid_t.h \
+ /usr/include/bits/types/cookie_io_functions_t.h \
+ /usr/include/bits/types/error_t.h \
+ /usr/include/bits/types/locale_t.h \
+ /usr/include/bits/types/mbstate_t.h \
+ /usr/include/bits/types/sigset_t.h \
+ /usr/include/bits/types/struct_FILE.h \
+ /usr/include/bits/types/struct___jmp_buf_tag.h \
+ /usr/include/bits/types/struct_itimerspec.h \
+ /usr/include/bits/types/struct_sched_param.h \
+ /usr/include/bits/types/struct_timespec.h \
+ /usr/include/bits/types/struct_timeval.h \
+ /usr/include/bits/types/struct_tm.h \
/usr/include/bits/types/time_t.h \
/usr/include/bits/types/timer_t.h \
- /usr/include/endian.h \
- /usr/include/bits/byteswap.h \
+ /usr/include/bits/types/wint_t.h \
+ /usr/include/bits/typesizes.h \
/usr/include/bits/uintn-identity.h \
- /usr/include/sys/select.h \
- /usr/include/bits/select.h \
- /usr/include/bits/types/sigset_t.h \
- /usr/include/bits/types/__sigset_t.h \
- /usr/include/bits/types/struct_timeval.h \
- /usr/include/bits/types/struct_timespec.h \
- /usr/include/bits/pthreadtypes.h \
- /usr/include/bits/thread-shared-types.h \
- /usr/include/bits/pthreadtypes-arch.h \
- /usr/include/bits/atomic_wide_counter.h \
- /usr/include/bits/struct_mutex.h \
- /usr/include/bits/struct_rwlock.h \
- /usr/include/alloca.h \
- /usr/include/bits/stdlib-bsearch.h \
- /usr/include/bits/stdlib-float.h \
- /usr/include/c++/12/bits/std_abs.h \
- /usr/include/c++/12/cstdio \
- /usr/include/stdio.h \
- /usr/include/bits/types/__fpos_t.h \
- /usr/include/bits/types/__fpos64_t.h \
- /usr/include/bits/types/struct_FILE.h \
- /usr/include/bits/types/cookie_io_functions_t.h \
- /usr/include/bits/stdio_lim.h \
- /usr/include/bits/stdio.h \
- /usr/include/c++/12/cerrno \
+ /usr/include/bits/waitflags.h \
+ /usr/include/bits/waitstatus.h \
+ /usr/include/bits/wchar.h \
+ /usr/include/bits/wctype-wchar.h \
+ /usr/include/bits/wordsize.h \
+ /usr/include/c++/13/algorithm \
+ /usr/include/c++/13/backward/auto_ptr.h \
+ /usr/include/c++/13/backward/binders.h \
+ /usr/include/c++/13/bit \
+ /usr/include/c++/13/bits/algorithmfwd.h \
+ /usr/include/c++/13/bits/align.h \
+ /usr/include/c++/13/bits/alloc_traits.h \
+ /usr/include/c++/13/bits/allocated_ptr.h \
+ /usr/include/c++/13/bits/allocator.h \
+ /usr/include/c++/13/bits/atomic_base.h \
+ /usr/include/c++/13/bits/atomic_lockfree_defines.h \
+ /usr/include/c++/13/bits/basic_string.h \
+ /usr/include/c++/13/bits/basic_string.tcc \
+ /usr/include/c++/13/bits/char_traits.h \
+ /usr/include/c++/13/bits/charconv.h \
+ /usr/include/c++/13/bits/codecvt.h \
+ /usr/include/c++/13/bits/concept_check.h \
+ /usr/include/c++/13/bits/cpp_type_traits.h \
+ /usr/include/c++/13/bits/cxxabi_forced.h \
+ /usr/include/c++/13/bits/cxxabi_init_exception.h \
+ /usr/include/c++/13/bits/exception.h \
+ /usr/include/c++/13/bits/exception_defines.h \
+ /usr/include/c++/13/bits/exception_ptr.h \
+ /usr/include/c++/13/bits/functexcept.h \
+ /usr/include/c++/13/bits/functional_hash.h \
+ /usr/include/c++/13/bits/hash_bytes.h \
+ /usr/include/c++/13/bits/invoke.h \
+ /usr/include/c++/13/bits/ios_base.h \
+ /usr/include/c++/13/bits/locale_classes.h \
+ /usr/include/c++/13/bits/locale_classes.tcc \
+ /usr/include/c++/13/bits/locale_conv.h \
+ /usr/include/c++/13/bits/locale_facets.h \
+ /usr/include/c++/13/bits/locale_facets.tcc \
+ /usr/include/c++/13/bits/locale_facets_nonio.h \
+ /usr/include/c++/13/bits/locale_facets_nonio.tcc \
+ /usr/include/c++/13/bits/localefwd.h \
+ /usr/include/c++/13/bits/memoryfwd.h \
+ /usr/include/c++/13/bits/move.h \
+ /usr/include/c++/13/bits/nested_exception.h \
+ /usr/include/c++/13/bits/new_allocator.h \
+ /usr/include/c++/13/bits/ostream_insert.h \
+ /usr/include/c++/13/bits/postypes.h \
+ /usr/include/c++/13/bits/predefined_ops.h \
+ /usr/include/c++/13/bits/ptr_traits.h \
+ /usr/include/c++/13/bits/range_access.h \
+ /usr/include/c++/13/bits/refwrap.h \
+ /usr/include/c++/13/bits/requires_hosted.h \
+ /usr/include/c++/13/bits/shared_ptr.h \
+ /usr/include/c++/13/bits/shared_ptr_atomic.h \
+ /usr/include/c++/13/bits/shared_ptr_base.h \
+ /usr/include/c++/13/bits/std_abs.h \
+ /usr/include/c++/13/bits/stl_algo.h \
+ /usr/include/c++/13/bits/stl_algobase.h \
+ /usr/include/c++/13/bits/stl_construct.h \
+ /usr/include/c++/13/bits/stl_function.h \
+ /usr/include/c++/13/bits/stl_heap.h \
+ /usr/include/c++/13/bits/stl_iterator.h \
+ /usr/include/c++/13/bits/stl_iterator_base_funcs.h \
+ /usr/include/c++/13/bits/stl_iterator_base_types.h \
+ /usr/include/c++/13/bits/stl_pair.h \
+ /usr/include/c++/13/bits/stl_raw_storage_iter.h \
+ /usr/include/c++/13/bits/stl_relops.h \
+ /usr/include/c++/13/bits/stl_tempbuf.h \
+ /usr/include/c++/13/bits/stl_uninitialized.h \
+ /usr/include/c++/13/bits/stream_iterator.h \
+ /usr/include/c++/13/bits/streambuf.tcc \
+ /usr/include/c++/13/bits/streambuf_iterator.h \
+ /usr/include/c++/13/bits/stringfwd.h \
+ /usr/include/c++/13/bits/uniform_int_dist.h \
+ /usr/include/c++/13/bits/unique_ptr.h \
+ /usr/include/c++/13/bits/uses_allocator.h \
+ /usr/include/c++/13/bits/utility.h \
+ /usr/include/c++/13/cassert \
+ /usr/include/c++/13/cctype \
+ /usr/include/c++/13/cerrno \
+ /usr/include/c++/13/clocale \
+ /usr/include/c++/13/cstdio \
+ /usr/include/c++/13/cstdlib \
+ /usr/include/c++/13/cstring \
+ /usr/include/c++/13/ctime \
+ /usr/include/c++/13/cwchar \
+ /usr/include/c++/13/cwctype \
+ /usr/include/c++/13/debug/assertions.h \
+ /usr/include/c++/13/debug/debug.h \
+ /usr/include/c++/13/exception \
+ /usr/include/c++/13/ext/aligned_buffer.h \
+ /usr/include/c++/13/ext/alloc_traits.h \
+ /usr/include/c++/13/ext/atomicity.h \
+ /usr/include/c++/13/ext/concurrence.h \
+ /usr/include/c++/13/ext/numeric_traits.h \
+ /usr/include/c++/13/ext/string_conversions.h \
+ /usr/include/c++/13/ext/type_traits.h \
+ /usr/include/c++/13/initializer_list \
+ /usr/include/c++/13/iosfwd \
+ /usr/include/c++/13/iterator \
+ /usr/include/c++/13/limits \
+ /usr/include/c++/13/locale \
+ /usr/include/c++/13/memory \
+ /usr/include/c++/13/new \
+ /usr/include/c++/13/stdexcept \
+ /usr/include/c++/13/streambuf \
+ /usr/include/c++/13/string \
+ /usr/include/c++/13/system_error \
+ /usr/include/c++/13/tuple \
+ /usr/include/c++/13/type_traits \
+ /usr/include/c++/13/typeinfo \
+ /usr/include/c++/13/utility \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/atomic_word.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++allocator.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++config.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++locale.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/cpu_defines.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/ctype_base.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/ctype_inline.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/error_constants.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/gthr-default.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/gthr.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/messages_members.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/os_defines.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/time_members.h \
+ /usr/include/ctype.h \
+ /usr/include/endian.h \
/usr/include/errno.h \
- /usr/include/bits/errno.h \
+ /usr/include/features-time64.h \
+ /usr/include/features.h \
+ /usr/include/gnu/stubs-64.h \
+ /usr/include/gnu/stubs.h \
+ /usr/include/libintl.h \
/usr/include/linux/errno.h \
- /usr/include/asm/errno.h \
- /usr/include/asm-generic/errno.h \
- /usr/include/asm-generic/errno-base.h \
- /usr/include/bits/types/error_t.h \
- /usr/include/c++/12/bits/charconv.h \
- /usr/include/c++/12/bits/functional_hash.h \
- /usr/include/c++/12/bits/hash_bytes.h \
- /usr/include/c++/12/bits/basic_string.tcc \
- /usr/include/c++/12/utility \
- /usr/include/c++/12/bits/stl_relops.h \
- /usr/include/c++/12/iterator \
- /usr/include/c++/12/bits/stream_iterator.h \
- /usr/include/c++/12/bits/streambuf_iterator.h \
- /usr/include/c++/12/streambuf \
- /usr/include/c++/12/bits/ios_base.h \
- /usr/include/c++/12/ext/atomicity.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/gthr.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/gthr-default.h \
+ /usr/include/locale.h \
/usr/include/pthread.h \
/usr/include/sched.h \
- /usr/include/bits/sched.h \
- /usr/include/bits/types/struct_sched_param.h \
- /usr/include/bits/cpu-set.h \
- /usr/include/time.h \
- /usr/include/bits/time.h \
- /usr/include/bits/timex.h \
- /usr/include/bits/types/struct_tm.h \
- /usr/include/bits/types/struct_itimerspec.h \
- /usr/include/bits/setjmp.h \
- /usr/include/bits/types/struct___jmp_buf_tag.h \
- /usr/include/bits/pthread_stack_min-dynamic.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/atomic_word.h \
+ /usr/include/stdc-predef.h \
+ /usr/include/stdint.h \
+ /usr/include/stdio.h \
+ /usr/include/stdlib.h \
+ /usr/include/string.h \
+ /usr/include/strings.h \
+ /usr/include/sys/cdefs.h \
+ /usr/include/sys/select.h \
/usr/include/sys/single_threaded.h \
- /usr/include/c++/12/bits/locale_classes.h \
- /usr/include/c++/12/bits/locale_classes.tcc \
- /usr/include/c++/12/system_error \
- /usr/include/c++/12/x86_64-redhat-linux/bits/error_constants.h \
- /usr/include/c++/12/stdexcept \
- /usr/include/c++/12/exception \
- /usr/include/c++/12/bits/exception_ptr.h \
- /usr/include/c++/12/bits/cxxabi_init_exception.h \
- /usr/include/c++/12/typeinfo \
- /usr/include/c++/12/bits/nested_exception.h \
- /usr/include/c++/12/bits/streambuf.tcc \
+ /usr/include/sys/types.h \
+ /usr/include/time.h \
+ /usr/include/wchar.h \
+ /usr/include/wctype.h \
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stdarg.h \
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stddef.h \
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stdint.h \
third_party/uri/include/network/optional.hpp \
- /usr/include/c++/12/memory \
- /usr/include/c++/12/bits/stl_uninitialized.h \
- /usr/include/c++/12/bits/stl_tempbuf.h \
- /usr/include/c++/12/bits/stl_raw_storage_iter.h \
- /usr/include/c++/12/bits/align.h \
- /usr/include/c++/12/bit \
- /usr/include/c++/12/bits/uses_allocator.h \
- /usr/include/c++/12/bits/unique_ptr.h \
- /usr/include/c++/12/tuple \
- /usr/include/c++/12/bits/shared_ptr.h \
- /usr/include/c++/12/bits/shared_ptr_base.h \
- /usr/include/c++/12/bits/allocated_ptr.h \
- /usr/include/c++/12/ext/aligned_buffer.h \
- /usr/include/c++/12/ext/concurrence.h \
- /usr/include/c++/12/bits/shared_ptr_atomic.h \
- /usr/include/c++/12/bits/atomic_base.h \
- /usr/include/c++/12/bits/atomic_lockfree_defines.h \
- /usr/include/c++/12/backward/auto_ptr.h \
- /usr/include/c++/12/algorithm \
- /usr/include/c++/12/bits/stl_algo.h \
- /usr/include/c++/12/bits/algorithmfwd.h \
- /usr/include/c++/12/bits/stl_heap.h \
- /usr/include/c++/12/bits/uniform_int_dist.h \
third_party/uri/include/network/string_view.hpp \
- /usr/include/c++/12/cassert \
- /usr/include/assert.h \
- /usr/include/c++/12/limits \
+ third_party/uri/include/network/uri/detail/uri_parts.hpp \
third_party/uri/src/detail/grammar.hpp \
- /usr/include/c++/12/locale \
- /usr/include/c++/12/bits/locale_facets.h \
- /usr/include/c++/12/cwctype \
- /usr/include/wctype.h \
- /usr/include/bits/wctype-wchar.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/ctype_base.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/ctype_inline.h \
- /usr/include/c++/12/bits/locale_facets.tcc \
- /usr/include/c++/12/bits/locale_facets_nonio.h \
- /usr/include/c++/12/ctime \
- /usr/include/c++/12/x86_64-redhat-linux/bits/time_members.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/messages_members.h \
- /usr/include/libintl.h \
- /usr/include/c++/12/bits/codecvt.h \
- /usr/include/c++/12/bits/locale_facets_nonio.tcc \
- /usr/include/c++/12/bits/locale_conv.h \
- /usr/include/c++/12/cstring \
- /usr/include/string.h \
- /usr/include/strings.h
+ third_party/uri/src/detail/uri_parse_authority.hpp
third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.o: third_party/uri/src/detail/uri_resolve.cpp \
- /usr/include/stdc-predef.h \
- third_party/uri/src/detail/uri_resolve.hpp \
- third_party/uri/include/network/uri/uri.hpp \
- /usr/include/c++/12/iterator \
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++config.h \
- /usr/include/bits/wordsize.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/os_defines.h \
- /usr/include/features.h \
- /usr/include/features-time64.h \
- /usr/include/bits/timesize.h \
- /usr/include/sys/cdefs.h \
- /usr/include/bits/long-double.h \
- /usr/include/gnu/stubs.h \
- /usr/include/gnu/stubs-64.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/cpu_defines.h \
- /usr/include/c++/12/bits/stl_iterator_base_types.h \
- /usr/include/c++/12/type_traits \
- /usr/include/c++/12/bits/stl_iterator_base_funcs.h \
- /usr/include/c++/12/bits/concept_check.h \
- /usr/include/c++/12/debug/assertions.h \
- /usr/include/c++/12/bits/stl_iterator.h \
- /usr/include/c++/12/bits/cpp_type_traits.h \
- /usr/include/c++/12/ext/type_traits.h \
- /usr/include/c++/12/bits/move.h \
- /usr/include/c++/12/bits/ptr_traits.h \
- /usr/include/c++/12/iosfwd \
- /usr/include/c++/12/bits/stringfwd.h \
- /usr/include/c++/12/bits/memoryfwd.h \
- /usr/include/c++/12/bits/postypes.h \
- /usr/include/c++/12/cwchar \
- /usr/include/wchar.h \
- /usr/include/bits/libc-header-start.h \
- /usr/include/bits/floatn.h \
- /usr/include/bits/floatn-common.h \
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stddef.h \
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stdarg.h \
- /usr/include/bits/wchar.h \
- /usr/include/bits/types/wint_t.h \
- /usr/include/bits/types/mbstate_t.h \
- /usr/include/bits/types/__mbstate_t.h \
- /usr/include/bits/types/__FILE.h \
- /usr/include/bits/types/FILE.h \
- /usr/include/bits/types/locale_t.h \
- /usr/include/bits/types/__locale_t.h \
- /usr/include/c++/12/bits/stream_iterator.h \
- /usr/include/c++/12/debug/debug.h \
- /usr/include/c++/12/bits/streambuf_iterator.h \
- /usr/include/c++/12/streambuf \
- /usr/include/c++/12/bits/localefwd.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++locale.h \
- /usr/include/c++/12/clocale \
- /usr/include/locale.h \
- /usr/include/bits/locale.h \
- /usr/include/c++/12/cctype \
- /usr/include/ctype.h \
- /usr/include/bits/types.h \
- /usr/include/bits/typesizes.h \
- /usr/include/bits/time64.h \
+ /usr/include/alloca.h \
+ /usr/include/asm-generic/errno-base.h \
+ /usr/include/asm-generic/errno.h \
+ /usr/include/asm/errno.h \
+ /usr/include/assert.h \
+ /usr/include/bits/atomic_wide_counter.h \
+ /usr/include/bits/byteswap.h \
+ /usr/include/bits/cpu-set.h \
/usr/include/bits/endian.h \
/usr/include/bits/endianness.h \
- /usr/include/c++/12/bits/ios_base.h \
- /usr/include/c++/12/ext/atomicity.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/gthr.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/gthr-default.h \
- /usr/include/pthread.h \
- /usr/include/sched.h \
- /usr/include/bits/types/time_t.h \
- /usr/include/bits/types/struct_timespec.h \
+ /usr/include/bits/errno.h \
+ /usr/include/bits/floatn-common.h \
+ /usr/include/bits/floatn.h \
+ /usr/include/bits/libc-header-start.h \
+ /usr/include/bits/locale.h \
+ /usr/include/bits/long-double.h \
+ /usr/include/bits/pthread_stack_min-dynamic.h \
+ /usr/include/bits/pthreadtypes-arch.h \
+ /usr/include/bits/pthreadtypes.h \
/usr/include/bits/sched.h \
- /usr/include/bits/types/struct_sched_param.h \
- /usr/include/bits/cpu-set.h \
- /usr/include/time.h \
+ /usr/include/bits/select.h \
+ /usr/include/bits/setjmp.h \
+ /usr/include/bits/stdint-intn.h \
+ /usr/include/bits/stdint-uintn.h \
+ /usr/include/bits/stdio.h \
+ /usr/include/bits/stdio_lim.h \
+ /usr/include/bits/stdlib-bsearch.h \
+ /usr/include/bits/stdlib-float.h \
+ /usr/include/bits/struct_mutex.h \
+ /usr/include/bits/struct_rwlock.h \
+ /usr/include/bits/thread-shared-types.h \
/usr/include/bits/time.h \
+ /usr/include/bits/time64.h \
+ /usr/include/bits/timesize.h \
/usr/include/bits/timex.h \
- /usr/include/bits/types/struct_timeval.h \
+ /usr/include/bits/types.h \
+ /usr/include/bits/types/FILE.h \
+ /usr/include/bits/types/__FILE.h \
+ /usr/include/bits/types/__fpos64_t.h \
+ /usr/include/bits/types/__fpos_t.h \
+ /usr/include/bits/types/__locale_t.h \
+ /usr/include/bits/types/__mbstate_t.h \
+ /usr/include/bits/types/__sigset_t.h \
/usr/include/bits/types/clock_t.h \
- /usr/include/bits/types/struct_tm.h \
/usr/include/bits/types/clockid_t.h \
- /usr/include/bits/types/timer_t.h \
- /usr/include/bits/types/struct_itimerspec.h \
- /usr/include/bits/pthreadtypes.h \
- /usr/include/bits/thread-shared-types.h \
- /usr/include/bits/pthreadtypes-arch.h \
- /usr/include/bits/atomic_wide_counter.h \
- /usr/include/bits/struct_mutex.h \
- /usr/include/bits/struct_rwlock.h \
- /usr/include/bits/setjmp.h \
- /usr/include/bits/types/__sigset_t.h \
+ /usr/include/bits/types/cookie_io_functions_t.h \
+ /usr/include/bits/types/error_t.h \
+ /usr/include/bits/types/locale_t.h \
+ /usr/include/bits/types/mbstate_t.h \
+ /usr/include/bits/types/sigset_t.h \
+ /usr/include/bits/types/struct_FILE.h \
/usr/include/bits/types/struct___jmp_buf_tag.h \
- /usr/include/bits/pthread_stack_min-dynamic.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/atomic_word.h \
- /usr/include/sys/single_threaded.h \
- /usr/include/c++/12/bits/locale_classes.h \
- /usr/include/c++/12/string \
- /usr/include/c++/12/bits/char_traits.h \
- /usr/include/c++/12/cstdint \
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stdint.h \
- /usr/include/stdint.h \
- /usr/include/bits/stdint-intn.h \
- /usr/include/bits/stdint-uintn.h \
- /usr/include/c++/12/bits/allocator.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++allocator.h \
- /usr/include/c++/12/bits/new_allocator.h \
- /usr/include/c++/12/new \
- /usr/include/c++/12/bits/exception.h \
- /usr/include/c++/12/bits/functexcept.h \
- /usr/include/c++/12/bits/exception_defines.h \
- /usr/include/c++/12/bits/ostream_insert.h \
- /usr/include/c++/12/bits/cxxabi_forced.h \
- /usr/include/c++/12/bits/stl_function.h \
- /usr/include/c++/12/backward/binders.h \
- /usr/include/c++/12/ext/numeric_traits.h \
- /usr/include/c++/12/bits/stl_algobase.h \
- /usr/include/c++/12/bits/stl_pair.h \
- /usr/include/c++/12/bits/utility.h \
- /usr/include/c++/12/bits/predefined_ops.h \
- /usr/include/c++/12/bits/refwrap.h \
- /usr/include/c++/12/bits/invoke.h \
- /usr/include/c++/12/bits/range_access.h \
- /usr/include/c++/12/initializer_list \
- /usr/include/c++/12/bits/basic_string.h \
- /usr/include/c++/12/ext/alloc_traits.h \
- /usr/include/c++/12/bits/alloc_traits.h \
- /usr/include/c++/12/bits/stl_construct.h \
- /usr/include/c++/12/ext/string_conversions.h \
- /usr/include/c++/12/cstdlib \
- /usr/include/stdlib.h \
+ /usr/include/bits/types/struct_itimerspec.h \
+ /usr/include/bits/types/struct_sched_param.h \
+ /usr/include/bits/types/struct_timespec.h \
+ /usr/include/bits/types/struct_timeval.h \
+ /usr/include/bits/types/struct_tm.h \
+ /usr/include/bits/types/time_t.h \
+ /usr/include/bits/types/timer_t.h \
+ /usr/include/bits/types/wint_t.h \
+ /usr/include/bits/typesizes.h \
+ /usr/include/bits/uintn-identity.h \
/usr/include/bits/waitflags.h \
/usr/include/bits/waitstatus.h \
- /usr/include/sys/types.h \
+ /usr/include/bits/wchar.h \
+ /usr/include/bits/wordsize.h \
+ /usr/include/c++/13/algorithm \
+ /usr/include/c++/13/backward/auto_ptr.h \
+ /usr/include/c++/13/backward/binders.h \
+ /usr/include/c++/13/bit \
+ /usr/include/c++/13/bits/algorithmfwd.h \
+ /usr/include/c++/13/bits/align.h \
+ /usr/include/c++/13/bits/alloc_traits.h \
+ /usr/include/c++/13/bits/allocated_ptr.h \
+ /usr/include/c++/13/bits/allocator.h \
+ /usr/include/c++/13/bits/atomic_base.h \
+ /usr/include/c++/13/bits/atomic_lockfree_defines.h \
+ /usr/include/c++/13/bits/basic_string.h \
+ /usr/include/c++/13/bits/basic_string.tcc \
+ /usr/include/c++/13/bits/char_traits.h \
+ /usr/include/c++/13/bits/charconv.h \
+ /usr/include/c++/13/bits/concept_check.h \
+ /usr/include/c++/13/bits/cpp_type_traits.h \
+ /usr/include/c++/13/bits/cxxabi_forced.h \
+ /usr/include/c++/13/bits/cxxabi_init_exception.h \
+ /usr/include/c++/13/bits/exception.h \
+ /usr/include/c++/13/bits/exception_defines.h \
+ /usr/include/c++/13/bits/exception_ptr.h \
+ /usr/include/c++/13/bits/functexcept.h \
+ /usr/include/c++/13/bits/functional_hash.h \
+ /usr/include/c++/13/bits/hash_bytes.h \
+ /usr/include/c++/13/bits/invoke.h \
+ /usr/include/c++/13/bits/ios_base.h \
+ /usr/include/c++/13/bits/locale_classes.h \
+ /usr/include/c++/13/bits/locale_classes.tcc \
+ /usr/include/c++/13/bits/localefwd.h \
+ /usr/include/c++/13/bits/memoryfwd.h \
+ /usr/include/c++/13/bits/move.h \
+ /usr/include/c++/13/bits/nested_exception.h \
+ /usr/include/c++/13/bits/new_allocator.h \
+ /usr/include/c++/13/bits/ostream_insert.h \
+ /usr/include/c++/13/bits/postypes.h \
+ /usr/include/c++/13/bits/predefined_ops.h \
+ /usr/include/c++/13/bits/ptr_traits.h \
+ /usr/include/c++/13/bits/range_access.h \
+ /usr/include/c++/13/bits/refwrap.h \
+ /usr/include/c++/13/bits/requires_hosted.h \
+ /usr/include/c++/13/bits/shared_ptr.h \
+ /usr/include/c++/13/bits/shared_ptr_atomic.h \
+ /usr/include/c++/13/bits/shared_ptr_base.h \
+ /usr/include/c++/13/bits/std_abs.h \
+ /usr/include/c++/13/bits/std_function.h \
+ /usr/include/c++/13/bits/stl_algo.h \
+ /usr/include/c++/13/bits/stl_algobase.h \
+ /usr/include/c++/13/bits/stl_construct.h \
+ /usr/include/c++/13/bits/stl_function.h \
+ /usr/include/c++/13/bits/stl_heap.h \
+ /usr/include/c++/13/bits/stl_iterator.h \
+ /usr/include/c++/13/bits/stl_iterator_base_funcs.h \
+ /usr/include/c++/13/bits/stl_iterator_base_types.h \
+ /usr/include/c++/13/bits/stl_pair.h \
+ /usr/include/c++/13/bits/stl_raw_storage_iter.h \
+ /usr/include/c++/13/bits/stl_relops.h \
+ /usr/include/c++/13/bits/stl_tempbuf.h \
+ /usr/include/c++/13/bits/stl_uninitialized.h \
+ /usr/include/c++/13/bits/stream_iterator.h \
+ /usr/include/c++/13/bits/streambuf.tcc \
+ /usr/include/c++/13/bits/streambuf_iterator.h \
+ /usr/include/c++/13/bits/stringfwd.h \
+ /usr/include/c++/13/bits/uniform_int_dist.h \
+ /usr/include/c++/13/bits/unique_ptr.h \
+ /usr/include/c++/13/bits/uses_allocator.h \
+ /usr/include/c++/13/bits/utility.h \
+ /usr/include/c++/13/cassert \
+ /usr/include/c++/13/cctype \
+ /usr/include/c++/13/cerrno \
+ /usr/include/c++/13/clocale \
+ /usr/include/c++/13/cstddef \
+ /usr/include/c++/13/cstdint \
+ /usr/include/c++/13/cstdio \
+ /usr/include/c++/13/cstdlib \
+ /usr/include/c++/13/cstring \
+ /usr/include/c++/13/cwchar \
+ /usr/include/c++/13/debug/assertions.h \
+ /usr/include/c++/13/debug/debug.h \
+ /usr/include/c++/13/exception \
+ /usr/include/c++/13/ext/aligned_buffer.h \
+ /usr/include/c++/13/ext/alloc_traits.h \
+ /usr/include/c++/13/ext/atomicity.h \
+ /usr/include/c++/13/ext/concurrence.h \
+ /usr/include/c++/13/ext/numeric_traits.h \
+ /usr/include/c++/13/ext/string_conversions.h \
+ /usr/include/c++/13/ext/type_traits.h \
+ /usr/include/c++/13/functional \
+ /usr/include/c++/13/initializer_list \
+ /usr/include/c++/13/iosfwd \
+ /usr/include/c++/13/iterator \
+ /usr/include/c++/13/memory \
+ /usr/include/c++/13/new \
+ /usr/include/c++/13/stdexcept \
+ /usr/include/c++/13/streambuf \
+ /usr/include/c++/13/string \
+ /usr/include/c++/13/system_error \
+ /usr/include/c++/13/tuple \
+ /usr/include/c++/13/type_traits \
+ /usr/include/c++/13/typeinfo \
+ /usr/include/c++/13/utility \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/atomic_word.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++allocator.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++config.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++locale.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/cpu_defines.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/error_constants.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/gthr-default.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/gthr.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/os_defines.h \
+ /usr/include/ctype.h \
/usr/include/endian.h \
- /usr/include/bits/byteswap.h \
- /usr/include/bits/uintn-identity.h \
- /usr/include/sys/select.h \
- /usr/include/bits/select.h \
- /usr/include/bits/types/sigset_t.h \
- /usr/include/alloca.h \
- /usr/include/bits/stdlib-bsearch.h \
- /usr/include/bits/stdlib-float.h \
- /usr/include/c++/12/bits/std_abs.h \
- /usr/include/c++/12/cstdio \
- /usr/include/stdio.h \
- /usr/include/bits/types/__fpos_t.h \
- /usr/include/bits/types/__fpos64_t.h \
- /usr/include/bits/types/struct_FILE.h \
- /usr/include/bits/types/cookie_io_functions_t.h \
- /usr/include/bits/stdio_lim.h \
- /usr/include/bits/stdio.h \
- /usr/include/c++/12/cerrno \
/usr/include/errno.h \
- /usr/include/bits/errno.h \
+ /usr/include/features-time64.h \
+ /usr/include/features.h \
+ /usr/include/gnu/stubs-64.h \
+ /usr/include/gnu/stubs.h \
/usr/include/linux/errno.h \
- /usr/include/asm/errno.h \
- /usr/include/asm-generic/errno.h \
- /usr/include/asm-generic/errno-base.h \
- /usr/include/bits/types/error_t.h \
- /usr/include/c++/12/bits/charconv.h \
- /usr/include/c++/12/bits/functional_hash.h \
- /usr/include/c++/12/bits/hash_bytes.h \
- /usr/include/c++/12/bits/basic_string.tcc \
- /usr/include/c++/12/bits/locale_classes.tcc \
- /usr/include/c++/12/system_error \
- /usr/include/c++/12/x86_64-redhat-linux/bits/error_constants.h \
- /usr/include/c++/12/stdexcept \
- /usr/include/c++/12/exception \
- /usr/include/c++/12/bits/exception_ptr.h \
- /usr/include/c++/12/bits/cxxabi_init_exception.h \
- /usr/include/c++/12/typeinfo \
- /usr/include/c++/12/bits/nested_exception.h \
- /usr/include/c++/12/bits/streambuf.tcc \
- /usr/include/c++/12/algorithm \
- /usr/include/c++/12/bits/stl_algo.h \
- /usr/include/c++/12/bits/algorithmfwd.h \
- /usr/include/c++/12/bits/stl_heap.h \
- /usr/include/c++/12/bits/stl_tempbuf.h \
- /usr/include/c++/12/bits/uniform_int_dist.h \
- /usr/include/c++/12/functional \
- /usr/include/c++/12/tuple \
- /usr/include/c++/12/bits/uses_allocator.h \
- /usr/include/c++/12/bits/std_function.h \
- /usr/include/c++/12/memory \
- /usr/include/c++/12/bits/stl_uninitialized.h \
- /usr/include/c++/12/bits/stl_raw_storage_iter.h \
- /usr/include/c++/12/bits/align.h \
- /usr/include/c++/12/bit \
- /usr/include/c++/12/bits/unique_ptr.h \
- /usr/include/c++/12/bits/shared_ptr.h \
- /usr/include/c++/12/bits/shared_ptr_base.h \
- /usr/include/c++/12/bits/allocated_ptr.h \
- /usr/include/c++/12/ext/aligned_buffer.h \
- /usr/include/c++/12/ext/concurrence.h \
- /usr/include/c++/12/bits/shared_ptr_atomic.h \
- /usr/include/c++/12/bits/atomic_base.h \
- /usr/include/c++/12/bits/atomic_lockfree_defines.h \
- /usr/include/c++/12/backward/auto_ptr.h \
- third_party/uri/include/network/string_view.hpp \
- /usr/include/c++/12/cassert \
- /usr/include/assert.h \
- third_party/uri/include/network/optional.hpp \
- /usr/include/c++/12/utility \
- /usr/include/c++/12/bits/stl_relops.h \
- third_party/uri/include/network/uri/config.hpp \
- third_party/uri/include/network/uri/uri_errors.hpp \
- third_party/uri/include/network/uri/detail/uri_parts.hpp \
- third_party/uri/include/network/uri/detail/encode.hpp \
- /usr/include/c++/12/cstring \
+ /usr/include/locale.h \
+ /usr/include/pthread.h \
+ /usr/include/sched.h \
+ /usr/include/stdc-predef.h \
+ /usr/include/stdint.h \
+ /usr/include/stdio.h \
+ /usr/include/stdlib.h \
/usr/include/string.h \
/usr/include/strings.h \
+ /usr/include/sys/cdefs.h \
+ /usr/include/sys/select.h \
+ /usr/include/sys/single_threaded.h \
+ /usr/include/sys/types.h \
+ /usr/include/time.h \
+ /usr/include/wchar.h \
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stdarg.h \
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stddef.h \
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stdint.h \
+ third_party/uri/include/network/optional.hpp \
+ third_party/uri/include/network/string_view.hpp \
+ third_party/uri/include/network/uri/config.hpp \
third_party/uri/include/network/uri/detail/decode.hpp \
+ third_party/uri/include/network/uri/detail/encode.hpp \
third_party/uri/include/network/uri/detail/translate.hpp \
+ third_party/uri/include/network/uri/detail/uri_parts.hpp \
+ third_party/uri/include/network/uri/uri.hpp \
third_party/uri/include/network/uri/uri_builder.hpp \
+ third_party/uri/include/network/uri/uri_errors.hpp \
third_party/uri/src/detail/algorithm_find.hpp \
- /usr/include/c++/12/cstddef
+ third_party/uri/src/detail/uri_resolve.hpp
third_party/uri/src/CMakeFiles/network-uri.dir/uri.cpp.o: third_party/uri/src/uri.cpp \
- /usr/include/stdc-predef.h \
- /usr/include/c++/12/cassert \
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++config.h \
- /usr/include/bits/wordsize.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/os_defines.h \
- /usr/include/features.h \
- /usr/include/features-time64.h \
- /usr/include/bits/timesize.h \
- /usr/include/sys/cdefs.h \
- /usr/include/bits/long-double.h \
- /usr/include/gnu/stubs.h \
- /usr/include/gnu/stubs-64.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/cpu_defines.h \
+ /usr/include/alloca.h \
+ /usr/include/asm-generic/errno-base.h \
+ /usr/include/asm-generic/errno.h \
+ /usr/include/asm/errno.h \
/usr/include/assert.h \
- /usr/include/c++/12/locale \
- /usr/include/c++/12/bits/localefwd.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++locale.h \
- /usr/include/c++/12/clocale \
- /usr/include/locale.h \
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stddef.h \
- /usr/include/bits/locale.h \
- /usr/include/bits/types/locale_t.h \
- /usr/include/bits/types/__locale_t.h \
- /usr/include/c++/12/iosfwd \
- /usr/include/c++/12/bits/stringfwd.h \
- /usr/include/c++/12/bits/memoryfwd.h \
- /usr/include/c++/12/bits/postypes.h \
- /usr/include/c++/12/cwchar \
- /usr/include/wchar.h \
- /usr/include/bits/libc-header-start.h \
- /usr/include/bits/floatn.h \
- /usr/include/bits/floatn-common.h \
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stdarg.h \
- /usr/include/bits/wchar.h \
- /usr/include/bits/types/wint_t.h \
- /usr/include/bits/types/mbstate_t.h \
- /usr/include/bits/types/__mbstate_t.h \
- /usr/include/bits/types/__FILE.h \
- /usr/include/bits/types/FILE.h \
- /usr/include/c++/12/cctype \
- /usr/include/ctype.h \
- /usr/include/bits/types.h \
- /usr/include/bits/typesizes.h \
- /usr/include/bits/time64.h \
+ /usr/include/bits/atomic_wide_counter.h \
+ /usr/include/bits/byteswap.h \
+ /usr/include/bits/cpu-set.h \
/usr/include/bits/endian.h \
/usr/include/bits/endianness.h \
- /usr/include/c++/12/bits/locale_classes.h \
- /usr/include/c++/12/string \
- /usr/include/c++/12/bits/char_traits.h \
- /usr/include/c++/12/type_traits \
- /usr/include/c++/12/cstdint \
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stdint.h \
- /usr/include/stdint.h \
+ /usr/include/bits/errno.h \
+ /usr/include/bits/floatn-common.h \
+ /usr/include/bits/floatn.h \
+ /usr/include/bits/libc-header-start.h \
+ /usr/include/bits/locale.h \
+ /usr/include/bits/long-double.h \
+ /usr/include/bits/pthread_stack_min-dynamic.h \
+ /usr/include/bits/pthreadtypes-arch.h \
+ /usr/include/bits/pthreadtypes.h \
+ /usr/include/bits/sched.h \
+ /usr/include/bits/select.h \
+ /usr/include/bits/setjmp.h \
/usr/include/bits/stdint-intn.h \
/usr/include/bits/stdint-uintn.h \
- /usr/include/c++/12/bits/allocator.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++allocator.h \
- /usr/include/c++/12/bits/new_allocator.h \
- /usr/include/c++/12/new \
- /usr/include/c++/12/bits/exception.h \
- /usr/include/c++/12/bits/functexcept.h \
- /usr/include/c++/12/bits/exception_defines.h \
- /usr/include/c++/12/bits/move.h \
- /usr/include/c++/12/bits/cpp_type_traits.h \
- /usr/include/c++/12/bits/ostream_insert.h \
- /usr/include/c++/12/bits/cxxabi_forced.h \
- /usr/include/c++/12/bits/stl_iterator_base_types.h \
- /usr/include/c++/12/bits/stl_iterator_base_funcs.h \
- /usr/include/c++/12/bits/concept_check.h \
- /usr/include/c++/12/debug/assertions.h \
- /usr/include/c++/12/bits/stl_iterator.h \
- /usr/include/c++/12/ext/type_traits.h \
- /usr/include/c++/12/bits/ptr_traits.h \
- /usr/include/c++/12/bits/stl_function.h \
- /usr/include/c++/12/backward/binders.h \
- /usr/include/c++/12/ext/numeric_traits.h \
- /usr/include/c++/12/bits/stl_algobase.h \
- /usr/include/c++/12/bits/stl_pair.h \
- /usr/include/c++/12/bits/utility.h \
- /usr/include/c++/12/debug/debug.h \
- /usr/include/c++/12/bits/predefined_ops.h \
- /usr/include/c++/12/bits/refwrap.h \
- /usr/include/c++/12/bits/invoke.h \
- /usr/include/c++/12/bits/range_access.h \
- /usr/include/c++/12/initializer_list \
- /usr/include/c++/12/bits/basic_string.h \
- /usr/include/c++/12/ext/alloc_traits.h \
- /usr/include/c++/12/bits/alloc_traits.h \
- /usr/include/c++/12/bits/stl_construct.h \
- /usr/include/c++/12/ext/string_conversions.h \
- /usr/include/c++/12/cstdlib \
- /usr/include/stdlib.h \
- /usr/include/bits/waitflags.h \
- /usr/include/bits/waitstatus.h \
- /usr/include/sys/types.h \
+ /usr/include/bits/stdio.h \
+ /usr/include/bits/stdio_lim.h \
+ /usr/include/bits/stdlib-bsearch.h \
+ /usr/include/bits/stdlib-float.h \
+ /usr/include/bits/struct_mutex.h \
+ /usr/include/bits/struct_rwlock.h \
+ /usr/include/bits/thread-shared-types.h \
+ /usr/include/bits/time.h \
+ /usr/include/bits/time64.h \
+ /usr/include/bits/timesize.h \
+ /usr/include/bits/timex.h \
+ /usr/include/bits/types.h \
+ /usr/include/bits/types/FILE.h \
+ /usr/include/bits/types/__FILE.h \
+ /usr/include/bits/types/__fpos64_t.h \
+ /usr/include/bits/types/__fpos_t.h \
+ /usr/include/bits/types/__locale_t.h \
+ /usr/include/bits/types/__mbstate_t.h \
+ /usr/include/bits/types/__sigset_t.h \
/usr/include/bits/types/clock_t.h \
/usr/include/bits/types/clockid_t.h \
+ /usr/include/bits/types/cookie_io_functions_t.h \
+ /usr/include/bits/types/error_t.h \
+ /usr/include/bits/types/locale_t.h \
+ /usr/include/bits/types/mbstate_t.h \
+ /usr/include/bits/types/sigset_t.h \
+ /usr/include/bits/types/struct_FILE.h \
+ /usr/include/bits/types/struct___jmp_buf_tag.h \
+ /usr/include/bits/types/struct_itimerspec.h \
+ /usr/include/bits/types/struct_sched_param.h \
+ /usr/include/bits/types/struct_timespec.h \
+ /usr/include/bits/types/struct_timeval.h \
+ /usr/include/bits/types/struct_tm.h \
/usr/include/bits/types/time_t.h \
/usr/include/bits/types/timer_t.h \
- /usr/include/endian.h \
- /usr/include/bits/byteswap.h \
+ /usr/include/bits/types/wint_t.h \
+ /usr/include/bits/typesizes.h \
/usr/include/bits/uintn-identity.h \
- /usr/include/sys/select.h \
- /usr/include/bits/select.h \
- /usr/include/bits/types/sigset_t.h \
- /usr/include/bits/types/__sigset_t.h \
- /usr/include/bits/types/struct_timeval.h \
- /usr/include/bits/types/struct_timespec.h \
- /usr/include/bits/pthreadtypes.h \
- /usr/include/bits/thread-shared-types.h \
- /usr/include/bits/pthreadtypes-arch.h \
- /usr/include/bits/atomic_wide_counter.h \
- /usr/include/bits/struct_mutex.h \
- /usr/include/bits/struct_rwlock.h \
- /usr/include/alloca.h \
- /usr/include/bits/stdlib-bsearch.h \
- /usr/include/bits/stdlib-float.h \
- /usr/include/c++/12/bits/std_abs.h \
- /usr/include/c++/12/cstdio \
- /usr/include/stdio.h \
- /usr/include/bits/types/__fpos_t.h \
- /usr/include/bits/types/__fpos64_t.h \
- /usr/include/bits/types/struct_FILE.h \
- /usr/include/bits/types/cookie_io_functions_t.h \
- /usr/include/bits/stdio_lim.h \
- /usr/include/bits/stdio.h \
- /usr/include/c++/12/cerrno \
+ /usr/include/bits/waitflags.h \
+ /usr/include/bits/waitstatus.h \
+ /usr/include/bits/wchar.h \
+ /usr/include/bits/wctype-wchar.h \
+ /usr/include/bits/wordsize.h \
+ /usr/include/c++/13/algorithm \
+ /usr/include/c++/13/backward/auto_ptr.h \
+ /usr/include/c++/13/backward/binders.h \
+ /usr/include/c++/13/bit \
+ /usr/include/c++/13/bits/algorithmfwd.h \
+ /usr/include/c++/13/bits/align.h \
+ /usr/include/c++/13/bits/alloc_traits.h \
+ /usr/include/c++/13/bits/allocated_ptr.h \
+ /usr/include/c++/13/bits/allocator.h \
+ /usr/include/c++/13/bits/atomic_base.h \
+ /usr/include/c++/13/bits/atomic_lockfree_defines.h \
+ /usr/include/c++/13/bits/basic_string.h \
+ /usr/include/c++/13/bits/basic_string.tcc \
+ /usr/include/c++/13/bits/char_traits.h \
+ /usr/include/c++/13/bits/charconv.h \
+ /usr/include/c++/13/bits/codecvt.h \
+ /usr/include/c++/13/bits/concept_check.h \
+ /usr/include/c++/13/bits/cpp_type_traits.h \
+ /usr/include/c++/13/bits/cxxabi_forced.h \
+ /usr/include/c++/13/bits/cxxabi_init_exception.h \
+ /usr/include/c++/13/bits/exception.h \
+ /usr/include/c++/13/bits/exception_defines.h \
+ /usr/include/c++/13/bits/exception_ptr.h \
+ /usr/include/c++/13/bits/functexcept.h \
+ /usr/include/c++/13/bits/functional_hash.h \
+ /usr/include/c++/13/bits/hash_bytes.h \
+ /usr/include/c++/13/bits/invoke.h \
+ /usr/include/c++/13/bits/ios_base.h \
+ /usr/include/c++/13/bits/locale_classes.h \
+ /usr/include/c++/13/bits/locale_classes.tcc \
+ /usr/include/c++/13/bits/locale_conv.h \
+ /usr/include/c++/13/bits/locale_facets.h \
+ /usr/include/c++/13/bits/locale_facets.tcc \
+ /usr/include/c++/13/bits/locale_facets_nonio.h \
+ /usr/include/c++/13/bits/locale_facets_nonio.tcc \
+ /usr/include/c++/13/bits/localefwd.h \
+ /usr/include/c++/13/bits/memoryfwd.h \
+ /usr/include/c++/13/bits/move.h \
+ /usr/include/c++/13/bits/nested_exception.h \
+ /usr/include/c++/13/bits/new_allocator.h \
+ /usr/include/c++/13/bits/ostream_insert.h \
+ /usr/include/c++/13/bits/postypes.h \
+ /usr/include/c++/13/bits/predefined_ops.h \
+ /usr/include/c++/13/bits/ptr_traits.h \
+ /usr/include/c++/13/bits/range_access.h \
+ /usr/include/c++/13/bits/refwrap.h \
+ /usr/include/c++/13/bits/requires_hosted.h \
+ /usr/include/c++/13/bits/shared_ptr.h \
+ /usr/include/c++/13/bits/shared_ptr_atomic.h \
+ /usr/include/c++/13/bits/shared_ptr_base.h \
+ /usr/include/c++/13/bits/std_abs.h \
+ /usr/include/c++/13/bits/std_function.h \
+ /usr/include/c++/13/bits/stl_algo.h \
+ /usr/include/c++/13/bits/stl_algobase.h \
+ /usr/include/c++/13/bits/stl_bvector.h \
+ /usr/include/c++/13/bits/stl_construct.h \
+ /usr/include/c++/13/bits/stl_function.h \
+ /usr/include/c++/13/bits/stl_heap.h \
+ /usr/include/c++/13/bits/stl_iterator.h \
+ /usr/include/c++/13/bits/stl_iterator_base_funcs.h \
+ /usr/include/c++/13/bits/stl_iterator_base_types.h \
+ /usr/include/c++/13/bits/stl_pair.h \
+ /usr/include/c++/13/bits/stl_raw_storage_iter.h \
+ /usr/include/c++/13/bits/stl_relops.h \
+ /usr/include/c++/13/bits/stl_tempbuf.h \
+ /usr/include/c++/13/bits/stl_uninitialized.h \
+ /usr/include/c++/13/bits/stl_vector.h \
+ /usr/include/c++/13/bits/stream_iterator.h \
+ /usr/include/c++/13/bits/streambuf.tcc \
+ /usr/include/c++/13/bits/streambuf_iterator.h \
+ /usr/include/c++/13/bits/stringfwd.h \
+ /usr/include/c++/13/bits/uniform_int_dist.h \
+ /usr/include/c++/13/bits/unique_ptr.h \
+ /usr/include/c++/13/bits/uses_allocator.h \
+ /usr/include/c++/13/bits/utility.h \
+ /usr/include/c++/13/bits/vector.tcc \
+ /usr/include/c++/13/cassert \
+ /usr/include/c++/13/cctype \
+ /usr/include/c++/13/cerrno \
+ /usr/include/c++/13/clocale \
+ /usr/include/c++/13/cstdint \
+ /usr/include/c++/13/cstdio \
+ /usr/include/c++/13/cstdlib \
+ /usr/include/c++/13/cstring \
+ /usr/include/c++/13/ctime \
+ /usr/include/c++/13/cwchar \
+ /usr/include/c++/13/cwctype \
+ /usr/include/c++/13/debug/assertions.h \
+ /usr/include/c++/13/debug/debug.h \
+ /usr/include/c++/13/exception \
+ /usr/include/c++/13/ext/aligned_buffer.h \
+ /usr/include/c++/13/ext/alloc_traits.h \
+ /usr/include/c++/13/ext/atomicity.h \
+ /usr/include/c++/13/ext/concurrence.h \
+ /usr/include/c++/13/ext/numeric_traits.h \
+ /usr/include/c++/13/ext/string_conversions.h \
+ /usr/include/c++/13/ext/type_traits.h \
+ /usr/include/c++/13/functional \
+ /usr/include/c++/13/initializer_list \
+ /usr/include/c++/13/iosfwd \
+ /usr/include/c++/13/iterator \
+ /usr/include/c++/13/locale \
+ /usr/include/c++/13/memory \
+ /usr/include/c++/13/new \
+ /usr/include/c++/13/stdexcept \
+ /usr/include/c++/13/streambuf \
+ /usr/include/c++/13/string \
+ /usr/include/c++/13/system_error \
+ /usr/include/c++/13/tuple \
+ /usr/include/c++/13/type_traits \
+ /usr/include/c++/13/typeinfo \
+ /usr/include/c++/13/utility \
+ /usr/include/c++/13/vector \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/atomic_word.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++allocator.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++config.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++locale.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/cpu_defines.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/ctype_base.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/ctype_inline.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/error_constants.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/gthr-default.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/gthr.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/messages_members.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/os_defines.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/time_members.h \
+ /usr/include/ctype.h \
+ /usr/include/endian.h \
/usr/include/errno.h \
- /usr/include/bits/errno.h \
+ /usr/include/features-time64.h \
+ /usr/include/features.h \
+ /usr/include/gnu/stubs-64.h \
+ /usr/include/gnu/stubs.h \
+ /usr/include/libintl.h \
/usr/include/linux/errno.h \
- /usr/include/asm/errno.h \
- /usr/include/asm-generic/errno.h \
- /usr/include/asm-generic/errno-base.h \
- /usr/include/bits/types/error_t.h \
- /usr/include/c++/12/bits/charconv.h \
- /usr/include/c++/12/bits/functional_hash.h \
- /usr/include/c++/12/bits/hash_bytes.h \
- /usr/include/c++/12/bits/basic_string.tcc \
- /usr/include/c++/12/ext/atomicity.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/gthr.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/gthr-default.h \
+ /usr/include/locale.h \
/usr/include/pthread.h \
/usr/include/sched.h \
- /usr/include/bits/sched.h \
- /usr/include/bits/types/struct_sched_param.h \
- /usr/include/bits/cpu-set.h \
- /usr/include/time.h \
- /usr/include/bits/time.h \
- /usr/include/bits/timex.h \
- /usr/include/bits/types/struct_tm.h \
- /usr/include/bits/types/struct_itimerspec.h \
- /usr/include/bits/setjmp.h \
- /usr/include/bits/types/struct___jmp_buf_tag.h \
- /usr/include/bits/pthread_stack_min-dynamic.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/atomic_word.h \
+ /usr/include/stdc-predef.h \
+ /usr/include/stdint.h \
+ /usr/include/stdio.h \
+ /usr/include/stdlib.h \
+ /usr/include/string.h \
+ /usr/include/strings.h \
+ /usr/include/sys/cdefs.h \
+ /usr/include/sys/select.h \
/usr/include/sys/single_threaded.h \
- /usr/include/c++/12/bits/locale_classes.tcc \
- /usr/include/c++/12/bits/locale_facets.h \
- /usr/include/c++/12/cwctype \
+ /usr/include/sys/types.h \
+ /usr/include/time.h \
+ /usr/include/wchar.h \
/usr/include/wctype.h \
- /usr/include/bits/wctype-wchar.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/ctype_base.h \
- /usr/include/c++/12/bits/ios_base.h \
- /usr/include/c++/12/system_error \
- /usr/include/c++/12/x86_64-redhat-linux/bits/error_constants.h \
- /usr/include/c++/12/stdexcept \
- /usr/include/c++/12/exception \
- /usr/include/c++/12/bits/exception_ptr.h \
- /usr/include/c++/12/bits/cxxabi_init_exception.h \
- /usr/include/c++/12/typeinfo \
- /usr/include/c++/12/bits/nested_exception.h \
- /usr/include/c++/12/streambuf \
- /usr/include/c++/12/bits/streambuf.tcc \
- /usr/include/c++/12/bits/streambuf_iterator.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/ctype_inline.h \
- /usr/include/c++/12/bits/locale_facets.tcc \
- /usr/include/c++/12/bits/locale_facets_nonio.h \
- /usr/include/c++/12/ctime \
- /usr/include/c++/12/x86_64-redhat-linux/bits/time_members.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/messages_members.h \
- /usr/include/libintl.h \
- /usr/include/c++/12/bits/codecvt.h \
- /usr/include/c++/12/bits/locale_facets_nonio.tcc \
- /usr/include/c++/12/bits/locale_conv.h \
- /usr/include/c++/12/algorithm \
- /usr/include/c++/12/bits/stl_algo.h \
- /usr/include/c++/12/bits/algorithmfwd.h \
- /usr/include/c++/12/bits/stl_heap.h \
- /usr/include/c++/12/bits/stl_tempbuf.h \
- /usr/include/c++/12/bits/uniform_int_dist.h \
- /usr/include/c++/12/functional \
- /usr/include/c++/12/tuple \
- /usr/include/c++/12/bits/uses_allocator.h \
- /usr/include/c++/12/bits/std_function.h \
- third_party/uri/include/network/uri/uri.hpp \
- /usr/include/c++/12/iterator \
- /usr/include/c++/12/bits/stream_iterator.h \
- /usr/include/c++/12/memory \
- /usr/include/c++/12/bits/stl_uninitialized.h \
- /usr/include/c++/12/bits/stl_raw_storage_iter.h \
- /usr/include/c++/12/bits/align.h \
- /usr/include/c++/12/bit \
- /usr/include/c++/12/bits/unique_ptr.h \
- /usr/include/c++/12/bits/shared_ptr.h \
- /usr/include/c++/12/bits/shared_ptr_base.h \
- /usr/include/c++/12/bits/allocated_ptr.h \
- /usr/include/c++/12/ext/aligned_buffer.h \
- /usr/include/c++/12/ext/concurrence.h \
- /usr/include/c++/12/bits/shared_ptr_atomic.h \
- /usr/include/c++/12/bits/atomic_base.h \
- /usr/include/c++/12/bits/atomic_lockfree_defines.h \
- /usr/include/c++/12/backward/auto_ptr.h \
- third_party/uri/include/network/string_view.hpp \
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stdarg.h \
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stddef.h \
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stdint.h \
third_party/uri/include/network/optional.hpp \
- /usr/include/c++/12/utility \
- /usr/include/c++/12/bits/stl_relops.h \
+ third_party/uri/include/network/string_view.hpp \
third_party/uri/include/network/uri/config.hpp \
- third_party/uri/include/network/uri/uri_errors.hpp \
- third_party/uri/include/network/uri/detail/uri_parts.hpp \
- third_party/uri/include/network/uri/detail/encode.hpp \
- /usr/include/c++/12/cstring \
- /usr/include/string.h \
- /usr/include/strings.h \
third_party/uri/include/network/uri/detail/decode.hpp \
+ third_party/uri/include/network/uri/detail/encode.hpp \
third_party/uri/include/network/uri/detail/translate.hpp \
+ third_party/uri/include/network/uri/detail/uri_parts.hpp \
+ third_party/uri/include/network/uri/uri.hpp \
third_party/uri/include/network/uri/uri_builder.hpp \
- third_party/uri/src/detail/uri_parse.hpp \
+ third_party/uri/include/network/uri/uri_errors.hpp \
+ third_party/uri/src/detail/algorithm.hpp \
third_party/uri/src/detail/uri_advance_parts.hpp \
- third_party/uri/src/detail/uri_percent_encode.hpp \
- /usr/include/c++/12/vector \
- /usr/include/c++/12/bits/stl_vector.h \
- /usr/include/c++/12/bits/stl_bvector.h \
- /usr/include/c++/12/bits/vector.tcc \
third_party/uri/src/detail/uri_normalize.hpp \
- third_party/uri/src/detail/uri_resolve.hpp \
- third_party/uri/src/detail/algorithm.hpp
+ third_party/uri/src/detail/uri_parse.hpp \
+ third_party/uri/src/detail/uri_percent_encode.hpp \
+ third_party/uri/src/detail/uri_resolve.hpp
third_party/uri/src/CMakeFiles/network-uri.dir/uri_builder.cpp.o: third_party/uri/src/uri_builder.cpp \
- /usr/include/stdc-predef.h \
- /usr/include/c++/12/locale \
- /usr/include/c++/12/bits/localefwd.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++config.h \
- /usr/include/bits/wordsize.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/os_defines.h \
- /usr/include/features.h \
- /usr/include/features-time64.h \
- /usr/include/bits/timesize.h \
- /usr/include/sys/cdefs.h \
- /usr/include/bits/long-double.h \
- /usr/include/gnu/stubs.h \
- /usr/include/gnu/stubs-64.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/cpu_defines.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++locale.h \
- /usr/include/c++/12/clocale \
- /usr/include/locale.h \
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stddef.h \
- /usr/include/bits/locale.h \
- /usr/include/bits/types/locale_t.h \
- /usr/include/bits/types/__locale_t.h \
- /usr/include/c++/12/iosfwd \
- /usr/include/c++/12/bits/stringfwd.h \
- /usr/include/c++/12/bits/memoryfwd.h \
- /usr/include/c++/12/bits/postypes.h \
- /usr/include/c++/12/cwchar \
- /usr/include/wchar.h \
- /usr/include/bits/libc-header-start.h \
- /usr/include/bits/floatn.h \
- /usr/include/bits/floatn-common.h \
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stdarg.h \
- /usr/include/bits/wchar.h \
- /usr/include/bits/types/wint_t.h \
- /usr/include/bits/types/mbstate_t.h \
- /usr/include/bits/types/__mbstate_t.h \
- /usr/include/bits/types/__FILE.h \
- /usr/include/bits/types/FILE.h \
- /usr/include/c++/12/cctype \
- /usr/include/ctype.h \
- /usr/include/bits/types.h \
- /usr/include/bits/typesizes.h \
- /usr/include/bits/time64.h \
+ /usr/include/alloca.h \
+ /usr/include/asm-generic/errno-base.h \
+ /usr/include/asm-generic/errno.h \
+ /usr/include/asm/errno.h \
+ /usr/include/assert.h \
+ /usr/include/bits/atomic_wide_counter.h \
+ /usr/include/bits/byteswap.h \
+ /usr/include/bits/cpu-set.h \
/usr/include/bits/endian.h \
/usr/include/bits/endianness.h \
- /usr/include/c++/12/bits/locale_classes.h \
- /usr/include/c++/12/string \
- /usr/include/c++/12/bits/char_traits.h \
- /usr/include/c++/12/type_traits \
- /usr/include/c++/12/cstdint \
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stdint.h \
- /usr/include/stdint.h \
+ /usr/include/bits/errno.h \
+ /usr/include/bits/floatn-common.h \
+ /usr/include/bits/floatn.h \
+ /usr/include/bits/libc-header-start.h \
+ /usr/include/bits/locale.h \
+ /usr/include/bits/long-double.h \
+ /usr/include/bits/pthread_stack_min-dynamic.h \
+ /usr/include/bits/pthreadtypes-arch.h \
+ /usr/include/bits/pthreadtypes.h \
+ /usr/include/bits/sched.h \
+ /usr/include/bits/select.h \
+ /usr/include/bits/setjmp.h \
/usr/include/bits/stdint-intn.h \
/usr/include/bits/stdint-uintn.h \
- /usr/include/c++/12/bits/allocator.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++allocator.h \
- /usr/include/c++/12/bits/new_allocator.h \
- /usr/include/c++/12/new \
- /usr/include/c++/12/bits/exception.h \
- /usr/include/c++/12/bits/functexcept.h \
- /usr/include/c++/12/bits/exception_defines.h \
- /usr/include/c++/12/bits/move.h \
- /usr/include/c++/12/bits/cpp_type_traits.h \
- /usr/include/c++/12/bits/ostream_insert.h \
- /usr/include/c++/12/bits/cxxabi_forced.h \
- /usr/include/c++/12/bits/stl_iterator_base_types.h \
- /usr/include/c++/12/bits/stl_iterator_base_funcs.h \
- /usr/include/c++/12/bits/concept_check.h \
- /usr/include/c++/12/debug/assertions.h \
- /usr/include/c++/12/bits/stl_iterator.h \
- /usr/include/c++/12/ext/type_traits.h \
- /usr/include/c++/12/bits/ptr_traits.h \
- /usr/include/c++/12/bits/stl_function.h \
- /usr/include/c++/12/backward/binders.h \
- /usr/include/c++/12/ext/numeric_traits.h \
- /usr/include/c++/12/bits/stl_algobase.h \
- /usr/include/c++/12/bits/stl_pair.h \
- /usr/include/c++/12/bits/utility.h \
- /usr/include/c++/12/debug/debug.h \
- /usr/include/c++/12/bits/predefined_ops.h \
- /usr/include/c++/12/bits/refwrap.h \
- /usr/include/c++/12/bits/invoke.h \
- /usr/include/c++/12/bits/range_access.h \
- /usr/include/c++/12/initializer_list \
- /usr/include/c++/12/bits/basic_string.h \
- /usr/include/c++/12/ext/alloc_traits.h \
- /usr/include/c++/12/bits/alloc_traits.h \
- /usr/include/c++/12/bits/stl_construct.h \
- /usr/include/c++/12/ext/string_conversions.h \
- /usr/include/c++/12/cstdlib \
- /usr/include/stdlib.h \
- /usr/include/bits/waitflags.h \
- /usr/include/bits/waitstatus.h \
- /usr/include/sys/types.h \
+ /usr/include/bits/stdio.h \
+ /usr/include/bits/stdio_lim.h \
+ /usr/include/bits/stdlib-bsearch.h \
+ /usr/include/bits/stdlib-float.h \
+ /usr/include/bits/struct_mutex.h \
+ /usr/include/bits/struct_rwlock.h \
+ /usr/include/bits/thread-shared-types.h \
+ /usr/include/bits/time.h \
+ /usr/include/bits/time64.h \
+ /usr/include/bits/timesize.h \
+ /usr/include/bits/timex.h \
+ /usr/include/bits/types.h \
+ /usr/include/bits/types/FILE.h \
+ /usr/include/bits/types/__FILE.h \
+ /usr/include/bits/types/__fpos64_t.h \
+ /usr/include/bits/types/__fpos_t.h \
+ /usr/include/bits/types/__locale_t.h \
+ /usr/include/bits/types/__mbstate_t.h \
+ /usr/include/bits/types/__sigset_t.h \
/usr/include/bits/types/clock_t.h \
/usr/include/bits/types/clockid_t.h \
+ /usr/include/bits/types/cookie_io_functions_t.h \
+ /usr/include/bits/types/error_t.h \
+ /usr/include/bits/types/locale_t.h \
+ /usr/include/bits/types/mbstate_t.h \
+ /usr/include/bits/types/sigset_t.h \
+ /usr/include/bits/types/struct_FILE.h \
+ /usr/include/bits/types/struct___jmp_buf_tag.h \
+ /usr/include/bits/types/struct_itimerspec.h \
+ /usr/include/bits/types/struct_sched_param.h \
+ /usr/include/bits/types/struct_timespec.h \
+ /usr/include/bits/types/struct_timeval.h \
+ /usr/include/bits/types/struct_tm.h \
/usr/include/bits/types/time_t.h \
/usr/include/bits/types/timer_t.h \
- /usr/include/endian.h \
- /usr/include/bits/byteswap.h \
+ /usr/include/bits/types/wint_t.h \
+ /usr/include/bits/typesizes.h \
/usr/include/bits/uintn-identity.h \
- /usr/include/sys/select.h \
- /usr/include/bits/select.h \
- /usr/include/bits/types/sigset_t.h \
- /usr/include/bits/types/__sigset_t.h \
- /usr/include/bits/types/struct_timeval.h \
- /usr/include/bits/types/struct_timespec.h \
- /usr/include/bits/pthreadtypes.h \
- /usr/include/bits/thread-shared-types.h \
- /usr/include/bits/pthreadtypes-arch.h \
- /usr/include/bits/atomic_wide_counter.h \
- /usr/include/bits/struct_mutex.h \
- /usr/include/bits/struct_rwlock.h \
- /usr/include/alloca.h \
- /usr/include/bits/stdlib-bsearch.h \
- /usr/include/bits/stdlib-float.h \
- /usr/include/c++/12/bits/std_abs.h \
- /usr/include/c++/12/cstdio \
- /usr/include/stdio.h \
- /usr/include/bits/types/__fpos_t.h \
- /usr/include/bits/types/__fpos64_t.h \
- /usr/include/bits/types/struct_FILE.h \
- /usr/include/bits/types/cookie_io_functions_t.h \
- /usr/include/bits/stdio_lim.h \
- /usr/include/bits/stdio.h \
- /usr/include/c++/12/cerrno \
+ /usr/include/bits/waitflags.h \
+ /usr/include/bits/waitstatus.h \
+ /usr/include/bits/wchar.h \
+ /usr/include/bits/wctype-wchar.h \
+ /usr/include/bits/wordsize.h \
+ /usr/include/c++/13/algorithm \
+ /usr/include/c++/13/backward/auto_ptr.h \
+ /usr/include/c++/13/backward/binders.h \
+ /usr/include/c++/13/bit \
+ /usr/include/c++/13/bits/algorithmfwd.h \
+ /usr/include/c++/13/bits/align.h \
+ /usr/include/c++/13/bits/alloc_traits.h \
+ /usr/include/c++/13/bits/allocated_ptr.h \
+ /usr/include/c++/13/bits/allocator.h \
+ /usr/include/c++/13/bits/atomic_base.h \
+ /usr/include/c++/13/bits/atomic_lockfree_defines.h \
+ /usr/include/c++/13/bits/basic_string.h \
+ /usr/include/c++/13/bits/basic_string.tcc \
+ /usr/include/c++/13/bits/char_traits.h \
+ /usr/include/c++/13/bits/charconv.h \
+ /usr/include/c++/13/bits/codecvt.h \
+ /usr/include/c++/13/bits/concept_check.h \
+ /usr/include/c++/13/bits/cpp_type_traits.h \
+ /usr/include/c++/13/bits/cxxabi_forced.h \
+ /usr/include/c++/13/bits/cxxabi_init_exception.h \
+ /usr/include/c++/13/bits/exception.h \
+ /usr/include/c++/13/bits/exception_defines.h \
+ /usr/include/c++/13/bits/exception_ptr.h \
+ /usr/include/c++/13/bits/functexcept.h \
+ /usr/include/c++/13/bits/functional_hash.h \
+ /usr/include/c++/13/bits/hash_bytes.h \
+ /usr/include/c++/13/bits/invoke.h \
+ /usr/include/c++/13/bits/ios_base.h \
+ /usr/include/c++/13/bits/locale_classes.h \
+ /usr/include/c++/13/bits/locale_classes.tcc \
+ /usr/include/c++/13/bits/locale_conv.h \
+ /usr/include/c++/13/bits/locale_facets.h \
+ /usr/include/c++/13/bits/locale_facets.tcc \
+ /usr/include/c++/13/bits/locale_facets_nonio.h \
+ /usr/include/c++/13/bits/locale_facets_nonio.tcc \
+ /usr/include/c++/13/bits/localefwd.h \
+ /usr/include/c++/13/bits/memoryfwd.h \
+ /usr/include/c++/13/bits/move.h \
+ /usr/include/c++/13/bits/nested_exception.h \
+ /usr/include/c++/13/bits/new_allocator.h \
+ /usr/include/c++/13/bits/ostream_insert.h \
+ /usr/include/c++/13/bits/postypes.h \
+ /usr/include/c++/13/bits/predefined_ops.h \
+ /usr/include/c++/13/bits/ptr_traits.h \
+ /usr/include/c++/13/bits/range_access.h \
+ /usr/include/c++/13/bits/refwrap.h \
+ /usr/include/c++/13/bits/requires_hosted.h \
+ /usr/include/c++/13/bits/shared_ptr.h \
+ /usr/include/c++/13/bits/shared_ptr_atomic.h \
+ /usr/include/c++/13/bits/shared_ptr_base.h \
+ /usr/include/c++/13/bits/std_abs.h \
+ /usr/include/c++/13/bits/std_function.h \
+ /usr/include/c++/13/bits/stl_algo.h \
+ /usr/include/c++/13/bits/stl_algobase.h \
+ /usr/include/c++/13/bits/stl_construct.h \
+ /usr/include/c++/13/bits/stl_function.h \
+ /usr/include/c++/13/bits/stl_heap.h \
+ /usr/include/c++/13/bits/stl_iterator.h \
+ /usr/include/c++/13/bits/stl_iterator_base_funcs.h \
+ /usr/include/c++/13/bits/stl_iterator_base_types.h \
+ /usr/include/c++/13/bits/stl_pair.h \
+ /usr/include/c++/13/bits/stl_raw_storage_iter.h \
+ /usr/include/c++/13/bits/stl_relops.h \
+ /usr/include/c++/13/bits/stl_tempbuf.h \
+ /usr/include/c++/13/bits/stl_uninitialized.h \
+ /usr/include/c++/13/bits/stream_iterator.h \
+ /usr/include/c++/13/bits/streambuf.tcc \
+ /usr/include/c++/13/bits/streambuf_iterator.h \
+ /usr/include/c++/13/bits/stringfwd.h \
+ /usr/include/c++/13/bits/uniform_int_dist.h \
+ /usr/include/c++/13/bits/unique_ptr.h \
+ /usr/include/c++/13/bits/uses_allocator.h \
+ /usr/include/c++/13/bits/utility.h \
+ /usr/include/c++/13/cassert \
+ /usr/include/c++/13/cctype \
+ /usr/include/c++/13/cerrno \
+ /usr/include/c++/13/clocale \
+ /usr/include/c++/13/cstdint \
+ /usr/include/c++/13/cstdio \
+ /usr/include/c++/13/cstdlib \
+ /usr/include/c++/13/cstring \
+ /usr/include/c++/13/ctime \
+ /usr/include/c++/13/cwchar \
+ /usr/include/c++/13/cwctype \
+ /usr/include/c++/13/debug/assertions.h \
+ /usr/include/c++/13/debug/debug.h \
+ /usr/include/c++/13/exception \
+ /usr/include/c++/13/ext/aligned_buffer.h \
+ /usr/include/c++/13/ext/alloc_traits.h \
+ /usr/include/c++/13/ext/atomicity.h \
+ /usr/include/c++/13/ext/concurrence.h \
+ /usr/include/c++/13/ext/numeric_traits.h \
+ /usr/include/c++/13/ext/string_conversions.h \
+ /usr/include/c++/13/ext/type_traits.h \
+ /usr/include/c++/13/functional \
+ /usr/include/c++/13/initializer_list \
+ /usr/include/c++/13/iosfwd \
+ /usr/include/c++/13/iterator \
+ /usr/include/c++/13/locale \
+ /usr/include/c++/13/memory \
+ /usr/include/c++/13/new \
+ /usr/include/c++/13/stdexcept \
+ /usr/include/c++/13/streambuf \
+ /usr/include/c++/13/string \
+ /usr/include/c++/13/system_error \
+ /usr/include/c++/13/tuple \
+ /usr/include/c++/13/type_traits \
+ /usr/include/c++/13/typeinfo \
+ /usr/include/c++/13/utility \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/atomic_word.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++allocator.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++config.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++locale.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/cpu_defines.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/ctype_base.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/ctype_inline.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/error_constants.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/gthr-default.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/gthr.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/messages_members.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/os_defines.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/time_members.h \
+ /usr/include/ctype.h \
+ /usr/include/endian.h \
/usr/include/errno.h \
- /usr/include/bits/errno.h \
+ /usr/include/features-time64.h \
+ /usr/include/features.h \
+ /usr/include/gnu/stubs-64.h \
+ /usr/include/gnu/stubs.h \
+ /usr/include/libintl.h \
/usr/include/linux/errno.h \
- /usr/include/asm/errno.h \
- /usr/include/asm-generic/errno.h \
- /usr/include/asm-generic/errno-base.h \
- /usr/include/bits/types/error_t.h \
- /usr/include/c++/12/bits/charconv.h \
- /usr/include/c++/12/bits/functional_hash.h \
- /usr/include/c++/12/bits/hash_bytes.h \
- /usr/include/c++/12/bits/basic_string.tcc \
- /usr/include/c++/12/ext/atomicity.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/gthr.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/gthr-default.h \
+ /usr/include/locale.h \
/usr/include/pthread.h \
/usr/include/sched.h \
- /usr/include/bits/sched.h \
- /usr/include/bits/types/struct_sched_param.h \
- /usr/include/bits/cpu-set.h \
- /usr/include/time.h \
- /usr/include/bits/time.h \
- /usr/include/bits/timex.h \
- /usr/include/bits/types/struct_tm.h \
- /usr/include/bits/types/struct_itimerspec.h \
- /usr/include/bits/setjmp.h \
- /usr/include/bits/types/struct___jmp_buf_tag.h \
- /usr/include/bits/pthread_stack_min-dynamic.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/atomic_word.h \
+ /usr/include/stdc-predef.h \
+ /usr/include/stdint.h \
+ /usr/include/stdio.h \
+ /usr/include/stdlib.h \
+ /usr/include/string.h \
+ /usr/include/strings.h \
+ /usr/include/sys/cdefs.h \
+ /usr/include/sys/select.h \
/usr/include/sys/single_threaded.h \
- /usr/include/c++/12/bits/locale_classes.tcc \
- /usr/include/c++/12/bits/locale_facets.h \
- /usr/include/c++/12/cwctype \
+ /usr/include/sys/types.h \
+ /usr/include/time.h \
+ /usr/include/wchar.h \
/usr/include/wctype.h \
- /usr/include/bits/wctype-wchar.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/ctype_base.h \
- /usr/include/c++/12/bits/ios_base.h \
- /usr/include/c++/12/system_error \
- /usr/include/c++/12/x86_64-redhat-linux/bits/error_constants.h \
- /usr/include/c++/12/stdexcept \
- /usr/include/c++/12/exception \
- /usr/include/c++/12/bits/exception_ptr.h \
- /usr/include/c++/12/bits/cxxabi_init_exception.h \
- /usr/include/c++/12/typeinfo \
- /usr/include/c++/12/bits/nested_exception.h \
- /usr/include/c++/12/streambuf \
- /usr/include/c++/12/bits/streambuf.tcc \
- /usr/include/c++/12/bits/streambuf_iterator.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/ctype_inline.h \
- /usr/include/c++/12/bits/locale_facets.tcc \
- /usr/include/c++/12/bits/locale_facets_nonio.h \
- /usr/include/c++/12/ctime \
- /usr/include/c++/12/x86_64-redhat-linux/bits/time_members.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/messages_members.h \
- /usr/include/libintl.h \
- /usr/include/c++/12/bits/codecvt.h \
- /usr/include/c++/12/bits/locale_facets_nonio.tcc \
- /usr/include/c++/12/bits/locale_conv.h \
- third_party/uri/include/network/uri/uri_builder.hpp \
- /usr/include/c++/12/utility \
- /usr/include/c++/12/bits/stl_relops.h \
- third_party/uri/include/network/uri/uri.hpp \
- /usr/include/c++/12/iterator \
- /usr/include/c++/12/bits/stream_iterator.h \
- /usr/include/c++/12/algorithm \
- /usr/include/c++/12/bits/stl_algo.h \
- /usr/include/c++/12/bits/algorithmfwd.h \
- /usr/include/c++/12/bits/stl_heap.h \
- /usr/include/c++/12/bits/stl_tempbuf.h \
- /usr/include/c++/12/bits/uniform_int_dist.h \
- /usr/include/c++/12/functional \
- /usr/include/c++/12/tuple \
- /usr/include/c++/12/bits/uses_allocator.h \
- /usr/include/c++/12/bits/std_function.h \
- /usr/include/c++/12/memory \
- /usr/include/c++/12/bits/stl_uninitialized.h \
- /usr/include/c++/12/bits/stl_raw_storage_iter.h \
- /usr/include/c++/12/bits/align.h \
- /usr/include/c++/12/bit \
- /usr/include/c++/12/bits/unique_ptr.h \
- /usr/include/c++/12/bits/shared_ptr.h \
- /usr/include/c++/12/bits/shared_ptr_base.h \
- /usr/include/c++/12/bits/allocated_ptr.h \
- /usr/include/c++/12/ext/aligned_buffer.h \
- /usr/include/c++/12/ext/concurrence.h \
- /usr/include/c++/12/bits/shared_ptr_atomic.h \
- /usr/include/c++/12/bits/atomic_base.h \
- /usr/include/c++/12/bits/atomic_lockfree_defines.h \
- /usr/include/c++/12/backward/auto_ptr.h \
- third_party/uri/include/network/string_view.hpp \
- /usr/include/c++/12/cassert \
- /usr/include/assert.h \
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stdarg.h \
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stddef.h \
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stdint.h \
third_party/uri/include/network/optional.hpp \
+ third_party/uri/include/network/string_view.hpp \
third_party/uri/include/network/uri/config.hpp \
- third_party/uri/include/network/uri/uri_errors.hpp \
- third_party/uri/include/network/uri/detail/uri_parts.hpp \
- third_party/uri/include/network/uri/detail/encode.hpp \
- /usr/include/c++/12/cstring \
- /usr/include/string.h \
- /usr/include/strings.h \
third_party/uri/include/network/uri/detail/decode.hpp \
+ third_party/uri/include/network/uri/detail/encode.hpp \
third_party/uri/include/network/uri/detail/translate.hpp \
+ third_party/uri/include/network/uri/detail/uri_parts.hpp \
+ third_party/uri/include/network/uri/uri.hpp \
+ third_party/uri/include/network/uri/uri_builder.hpp \
+ third_party/uri/include/network/uri/uri_errors.hpp \
+ third_party/uri/src/detail/algorithm.hpp \
third_party/uri/src/detail/uri_normalize.hpp \
- third_party/uri/src/detail/uri_parse_authority.hpp \
- third_party/uri/src/detail/algorithm.hpp
+ third_party/uri/src/detail/uri_parse_authority.hpp
third_party/uri/src/CMakeFiles/network-uri.dir/uri_errors.cpp.o: third_party/uri/src/uri_errors.cpp \
- /usr/include/stdc-predef.h \
- /usr/include/c++/12/string \
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++config.h \
- /usr/include/bits/wordsize.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/os_defines.h \
- /usr/include/features.h \
- /usr/include/features-time64.h \
- /usr/include/bits/timesize.h \
- /usr/include/sys/cdefs.h \
- /usr/include/bits/long-double.h \
- /usr/include/gnu/stubs.h \
- /usr/include/gnu/stubs-64.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/cpu_defines.h \
- /usr/include/c++/12/bits/stringfwd.h \
- /usr/include/c++/12/bits/memoryfwd.h \
- /usr/include/c++/12/bits/char_traits.h \
- /usr/include/c++/12/bits/postypes.h \
- /usr/include/c++/12/cwchar \
- /usr/include/wchar.h \
- /usr/include/bits/libc-header-start.h \
- /usr/include/bits/floatn.h \
+ /usr/include/alloca.h \
+ /usr/include/asm-generic/errno-base.h \
+ /usr/include/asm-generic/errno.h \
+ /usr/include/asm/errno.h \
+ /usr/include/bits/atomic_wide_counter.h \
+ /usr/include/bits/byteswap.h \
+ /usr/include/bits/endian.h \
+ /usr/include/bits/endianness.h \
+ /usr/include/bits/errno.h \
/usr/include/bits/floatn-common.h \
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stddef.h \
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stdarg.h \
- /usr/include/bits/wchar.h \
- /usr/include/bits/types/wint_t.h \
- /usr/include/bits/types/mbstate_t.h \
- /usr/include/bits/types/__mbstate_t.h \
- /usr/include/bits/types/__FILE.h \
+ /usr/include/bits/floatn.h \
+ /usr/include/bits/libc-header-start.h \
+ /usr/include/bits/locale.h \
+ /usr/include/bits/long-double.h \
+ /usr/include/bits/pthreadtypes-arch.h \
+ /usr/include/bits/pthreadtypes.h \
+ /usr/include/bits/select.h \
+ /usr/include/bits/stdint-intn.h \
+ /usr/include/bits/stdio.h \
+ /usr/include/bits/stdio_lim.h \
+ /usr/include/bits/stdlib-bsearch.h \
+ /usr/include/bits/stdlib-float.h \
+ /usr/include/bits/struct_mutex.h \
+ /usr/include/bits/struct_rwlock.h \
+ /usr/include/bits/thread-shared-types.h \
+ /usr/include/bits/time64.h \
+ /usr/include/bits/timesize.h \
+ /usr/include/bits/types.h \
/usr/include/bits/types/FILE.h \
- /usr/include/bits/types/locale_t.h \
+ /usr/include/bits/types/__FILE.h \
+ /usr/include/bits/types/__fpos64_t.h \
+ /usr/include/bits/types/__fpos_t.h \
/usr/include/bits/types/__locale_t.h \
- /usr/include/c++/12/type_traits \
- /usr/include/c++/12/cstdint \
- /usr/lib/gcc/x86_64-redhat-linux/12/include/stdint.h \
- /usr/include/stdint.h \
- /usr/include/bits/types.h \
- /usr/include/bits/typesizes.h \
- /usr/include/bits/time64.h \
- /usr/include/bits/stdint-intn.h \
- /usr/include/bits/stdint-uintn.h \
- /usr/include/c++/12/bits/allocator.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++allocator.h \
- /usr/include/c++/12/bits/new_allocator.h \
- /usr/include/c++/12/new \
- /usr/include/c++/12/bits/exception.h \
- /usr/include/c++/12/bits/functexcept.h \
- /usr/include/c++/12/bits/exception_defines.h \
- /usr/include/c++/12/bits/move.h \
- /usr/include/c++/12/bits/cpp_type_traits.h \
- /usr/include/c++/12/bits/localefwd.h \
- /usr/include/c++/12/x86_64-redhat-linux/bits/c++locale.h \
- /usr/include/c++/12/clocale \
- /usr/include/locale.h \
- /usr/include/bits/locale.h \
- /usr/include/c++/12/iosfwd \
- /usr/include/c++/12/cctype \
- /usr/include/ctype.h \
- /usr/include/bits/endian.h \
- /usr/include/bits/endianness.h \
- /usr/include/c++/12/bits/ostream_insert.h \
- /usr/include/c++/12/bits/cxxabi_forced.h \
- /usr/include/c++/12/bits/stl_iterator_base_types.h \
- /usr/include/c++/12/bits/stl_iterator_base_funcs.h \
- /usr/include/c++/12/bits/concept_check.h \
- /usr/include/c++/12/debug/assertions.h \
- /usr/include/c++/12/bits/stl_iterator.h \
- /usr/include/c++/12/ext/type_traits.h \
- /usr/include/c++/12/bits/ptr_traits.h \
- /usr/include/c++/12/bits/stl_function.h \
- /usr/include/c++/12/backward/binders.h \
- /usr/include/c++/12/ext/numeric_traits.h \
- /usr/include/c++/12/bits/stl_algobase.h \
- /usr/include/c++/12/bits/stl_pair.h \
- /usr/include/c++/12/bits/utility.h \
- /usr/include/c++/12/debug/debug.h \
- /usr/include/c++/12/bits/predefined_ops.h \
- /usr/include/c++/12/bits/refwrap.h \
- /usr/include/c++/12/bits/invoke.h \
- /usr/include/c++/12/bits/range_access.h \
- /usr/include/c++/12/initializer_list \
- /usr/include/c++/12/bits/basic_string.h \
- /usr/include/c++/12/ext/alloc_traits.h \
- /usr/include/c++/12/bits/alloc_traits.h \
- /usr/include/c++/12/bits/stl_construct.h \
- /usr/include/c++/12/ext/string_conversions.h \
- /usr/include/c++/12/cstdlib \
- /usr/include/stdlib.h \
- /usr/include/bits/waitflags.h \
- /usr/include/bits/waitstatus.h \
- /usr/include/sys/types.h \
+ /usr/include/bits/types/__mbstate_t.h \
+ /usr/include/bits/types/__sigset_t.h \
/usr/include/bits/types/clock_t.h \
/usr/include/bits/types/clockid_t.h \
+ /usr/include/bits/types/cookie_io_functions_t.h \
+ /usr/include/bits/types/error_t.h \
+ /usr/include/bits/types/locale_t.h \
+ /usr/include/bits/types/mbstate_t.h \
+ /usr/include/bits/types/sigset_t.h \
+ /usr/include/bits/types/struct_FILE.h \
+ /usr/include/bits/types/struct_timespec.h \
+ /usr/include/bits/types/struct_timeval.h \
/usr/include/bits/types/time_t.h \
/usr/include/bits/types/timer_t.h \
- /usr/include/endian.h \
- /usr/include/bits/byteswap.h \
+ /usr/include/bits/types/wint_t.h \
+ /usr/include/bits/typesizes.h \
/usr/include/bits/uintn-identity.h \
- /usr/include/sys/select.h \
- /usr/include/bits/select.h \
- /usr/include/bits/types/sigset_t.h \
- /usr/include/bits/types/__sigset_t.h \
- /usr/include/bits/types/struct_timeval.h \
- /usr/include/bits/types/struct_timespec.h \
- /usr/include/bits/pthreadtypes.h \
- /usr/include/bits/thread-shared-types.h \
- /usr/include/bits/pthreadtypes-arch.h \
- /usr/include/bits/atomic_wide_counter.h \
- /usr/include/bits/struct_mutex.h \
- /usr/include/bits/struct_rwlock.h \
- /usr/include/alloca.h \
- /usr/include/bits/stdlib-bsearch.h \
- /usr/include/bits/stdlib-float.h \
- /usr/include/c++/12/bits/std_abs.h \
- /usr/include/c++/12/cstdio \
- /usr/include/stdio.h \
- /usr/include/bits/types/__fpos_t.h \
- /usr/include/bits/types/__fpos64_t.h \
- /usr/include/bits/types/struct_FILE.h \
- /usr/include/bits/types/cookie_io_functions_t.h \
- /usr/include/bits/stdio_lim.h \
- /usr/include/bits/stdio.h \
- /usr/include/c++/12/cerrno \
+ /usr/include/bits/waitflags.h \
+ /usr/include/bits/waitstatus.h \
+ /usr/include/bits/wchar.h \
+ /usr/include/bits/wordsize.h \
+ /usr/include/c++/13/backward/binders.h \
+ /usr/include/c++/13/bits/alloc_traits.h \
+ /usr/include/c++/13/bits/allocator.h \
+ /usr/include/c++/13/bits/basic_string.h \
+ /usr/include/c++/13/bits/basic_string.tcc \
+ /usr/include/c++/13/bits/char_traits.h \
+ /usr/include/c++/13/bits/charconv.h \
+ /usr/include/c++/13/bits/concept_check.h \
+ /usr/include/c++/13/bits/cpp_type_traits.h \
+ /usr/include/c++/13/bits/cxxabi_forced.h \
+ /usr/include/c++/13/bits/cxxabi_init_exception.h \
+ /usr/include/c++/13/bits/exception.h \
+ /usr/include/c++/13/bits/exception_defines.h \
+ /usr/include/c++/13/bits/exception_ptr.h \
+ /usr/include/c++/13/bits/functexcept.h \
+ /usr/include/c++/13/bits/functional_hash.h \
+ /usr/include/c++/13/bits/hash_bytes.h \
+ /usr/include/c++/13/bits/invoke.h \
+ /usr/include/c++/13/bits/localefwd.h \
+ /usr/include/c++/13/bits/memoryfwd.h \
+ /usr/include/c++/13/bits/move.h \
+ /usr/include/c++/13/bits/nested_exception.h \
+ /usr/include/c++/13/bits/new_allocator.h \
+ /usr/include/c++/13/bits/ostream_insert.h \
+ /usr/include/c++/13/bits/postypes.h \
+ /usr/include/c++/13/bits/predefined_ops.h \
+ /usr/include/c++/13/bits/ptr_traits.h \
+ /usr/include/c++/13/bits/range_access.h \
+ /usr/include/c++/13/bits/refwrap.h \
+ /usr/include/c++/13/bits/requires_hosted.h \
+ /usr/include/c++/13/bits/std_abs.h \
+ /usr/include/c++/13/bits/stl_algobase.h \
+ /usr/include/c++/13/bits/stl_construct.h \
+ /usr/include/c++/13/bits/stl_function.h \
+ /usr/include/c++/13/bits/stl_iterator.h \
+ /usr/include/c++/13/bits/stl_iterator_base_funcs.h \
+ /usr/include/c++/13/bits/stl_iterator_base_types.h \
+ /usr/include/c++/13/bits/stl_pair.h \
+ /usr/include/c++/13/bits/stringfwd.h \
+ /usr/include/c++/13/bits/utility.h \
+ /usr/include/c++/13/cctype \
+ /usr/include/c++/13/cerrno \
+ /usr/include/c++/13/clocale \
+ /usr/include/c++/13/cstdio \
+ /usr/include/c++/13/cstdlib \
+ /usr/include/c++/13/cwchar \
+ /usr/include/c++/13/debug/assertions.h \
+ /usr/include/c++/13/debug/debug.h \
+ /usr/include/c++/13/exception \
+ /usr/include/c++/13/ext/alloc_traits.h \
+ /usr/include/c++/13/ext/numeric_traits.h \
+ /usr/include/c++/13/ext/string_conversions.h \
+ /usr/include/c++/13/ext/type_traits.h \
+ /usr/include/c++/13/initializer_list \
+ /usr/include/c++/13/iosfwd \
+ /usr/include/c++/13/new \
+ /usr/include/c++/13/stdexcept \
+ /usr/include/c++/13/string \
+ /usr/include/c++/13/system_error \
+ /usr/include/c++/13/type_traits \
+ /usr/include/c++/13/typeinfo \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++allocator.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++config.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/c++locale.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/cpu_defines.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/error_constants.h \
+ /usr/include/c++/13/x86_64-redhat-linux/bits/os_defines.h \
+ /usr/include/ctype.h \
+ /usr/include/endian.h \
/usr/include/errno.h \
- /usr/include/bits/errno.h \
+ /usr/include/features-time64.h \
+ /usr/include/features.h \
+ /usr/include/gnu/stubs-64.h \
+ /usr/include/gnu/stubs.h \
/usr/include/linux/errno.h \
- /usr/include/asm/errno.h \
- /usr/include/asm-generic/errno.h \
- /usr/include/asm-generic/errno-base.h \
- /usr/include/bits/types/error_t.h \
- /usr/include/c++/12/bits/charconv.h \
- /usr/include/c++/12/bits/functional_hash.h \
- /usr/include/c++/12/bits/hash_bytes.h \
- /usr/include/c++/12/bits/basic_string.tcc \
- third_party/uri/include/network/uri/uri_errors.hpp \
- /usr/include/c++/12/system_error \
- /usr/include/c++/12/x86_64-redhat-linux/bits/error_constants.h \
- /usr/include/c++/12/stdexcept \
- /usr/include/c++/12/exception \
- /usr/include/c++/12/bits/exception_ptr.h \
- /usr/include/c++/12/bits/cxxabi_init_exception.h \
- /usr/include/c++/12/typeinfo \
- /usr/include/c++/12/bits/nested_exception.h \
- third_party/uri/include/network/uri/config.hpp
+ /usr/include/locale.h \
+ /usr/include/stdc-predef.h \
+ /usr/include/stdio.h \
+ /usr/include/stdlib.h \
+ /usr/include/sys/cdefs.h \
+ /usr/include/sys/select.h \
+ /usr/include/sys/types.h \
+ /usr/include/wchar.h \
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stdarg.h \
+ /usr/lib/gcc/x86_64-redhat-linux/13/include/stddef.h \
+ third_party/uri/include/network/uri/config.hpp \
+ third_party/uri/include/network/uri/uri_errors.hpp
third_party/uri/src/uri_errors.cpp:
@@ -1728,488 +1729,490 @@ third_party/uri/src/detail/grammar.hpp:
third_party/uri/src/detail/uri_parse.cpp:
-/usr/include/c++/12/bits/locale_conv.h:
-
-/usr/include/c++/12/bits/locale_facets_nonio.tcc:
+third_party/uri/src/detail/uri_percent_encode.hpp:
-/usr/include/c++/12/bits/codecvt.h:
+third_party/uri/src/detail/algorithm_split.hpp:
-/usr/include/libintl.h:
+third_party/uri/include/network/uri/uri_errors.hpp:
-/usr/include/c++/12/x86_64-redhat-linux/bits/time_members.h:
+third_party/uri/include/network/uri/uri.hpp:
-/usr/include/c++/12/ctime:
+third_party/uri/include/network/uri/config.hpp:
-/usr/include/c++/12/bits/locale_facets.tcc:
+/usr/include/string.h:
-/usr/include/c++/12/locale:
+/usr/include/c++/13/x86_64-redhat-linux/bits/ctype_inline.h:
-/usr/include/c++/12/bits/stl_bvector.h:
+/usr/include/c++/13/x86_64-redhat-linux/bits/ctype_base.h:
-/usr/include/c++/12/bits/stl_vector.h:
+/usr/include/c++/13/vector:
-third_party/uri/src/detail/uri_percent_encode.hpp:
+third_party/uri/src/detail/algorithm.hpp:
-/usr/include/c++/12/cstring:
+/usr/include/c++/13/ctime:
-third_party/uri/include/network/uri/detail/encode.hpp:
+/usr/include/c++/13/cstring:
-third_party/uri/include/network/uri/config.hpp:
+/usr/include/c++/13/bits/locale_facets_nonio.h:
-/usr/include/c++/12/functional:
+/usr/include/c++/13/bits/locale_facets.h:
-third_party/uri/include/network/uri/uri.hpp:
+/usr/include/c++/13/bits/locale_conv.h:
-/usr/include/c++/12/limits:
+third_party/uri/src/detail/uri_normalize.cpp:
-/usr/include/assert.h:
+/usr/include/c++/13/x86_64-redhat-linux/bits/time_members.h:
-/usr/include/c++/12/cassert:
+third_party/uri/include/network/uri/detail/uri_parts.hpp:
-/usr/include/c++/12/bits/stl_heap.h:
+third_party/uri/include/network/optional.hpp:
-/usr/include/c++/12/bits/stl_algo.h:
+/usr/lib/gcc/x86_64-redhat-linux/13/include/stdint.h:
-/usr/include/c++/12/algorithm:
+/usr/lib/gcc/x86_64-redhat-linux/13/include/stddef.h:
-/usr/include/c++/12/bits/atomic_lockfree_defines.h:
+/usr/lib/gcc/x86_64-redhat-linux/13/include/stdarg.h:
-/usr/include/c++/12/bits/shared_ptr_atomic.h:
+/usr/include/wchar.h:
-/usr/include/c++/12/ext/aligned_buffer.h:
+/usr/include/sys/single_threaded.h:
-/usr/include/c++/12/bits/locale_facets.h:
+/usr/include/sys/cdefs.h:
-/usr/include/c++/12/tuple:
+/usr/include/stdlib.h:
-/usr/include/c++/12/cwctype:
+/usr/include/stdio.h:
-/usr/include/c++/12/bits/unique_ptr.h:
+/usr/include/stdint.h:
-/usr/include/c++/12/bit:
+/usr/include/stdc-predef.h:
-/usr/include/c++/12/bits/stl_raw_storage_iter.h:
+/usr/include/sched.h:
-/usr/include/c++/12/bits/stl_tempbuf.h:
+/usr/include/pthread.h:
-/usr/include/string.h:
+/usr/include/linux/errno.h:
-/usr/include/c++/12/bits/stl_uninitialized.h:
+/usr/include/features-time64.h:
-/usr/include/c++/12/bits/streambuf.tcc:
+/usr/include/c++/13/x86_64-redhat-linux/bits/gthr-default.h:
-third_party/uri/src/detail/uri_resolve.hpp:
+/usr/include/c++/13/x86_64-redhat-linux/bits/cpu_defines.h:
-/usr/include/c++/12/bits/nested_exception.h:
+/usr/include/strings.h:
-/usr/include/c++/12/bits/cxxabi_init_exception.h:
+/usr/include/c++/13/x86_64-redhat-linux/bits/c++locale.h:
-/usr/include/c++/12/bits/exception_ptr.h:
+/usr/include/bits/wctype-wchar.h:
-/usr/include/c++/12/system_error:
+/usr/include/sys/types.h:
-/usr/include/c++/12/bits/locale_classes.h:
+/usr/include/c++/13/x86_64-redhat-linux/bits/atomic_word.h:
-/usr/include/sys/single_threaded.h:
+/usr/include/c++/13/bits/locale_facets_nonio.tcc:
-/usr/include/bits/pthread_stack_min-dynamic.h:
+/usr/include/c++/13/utility:
-/usr/include/c++/12/bits/allocated_ptr.h:
+/usr/include/c++/13/type_traits:
-/usr/include/bits/types/struct___jmp_buf_tag.h:
+third_party/uri/include/network/uri/detail/encode.hpp:
-third_party/uri/src/detail/uri_parse_authority.cpp:
+/usr/include/c++/13/tuple:
-/usr/include/bits/setjmp.h:
+/usr/include/c++/13/stdexcept:
-/usr/include/bits/types/struct_tm.h:
+/usr/include/c++/13/memory:
-/usr/include/c++/12/typeinfo:
+/usr/include/c++/13/limits:
-/usr/include/bits/cpu-set.h:
+/usr/include/c++/13/iterator:
-/usr/include/bits/types/struct_sched_param.h:
+/usr/include/c++/13/initializer_list:
-/usr/include/c++/12/backward/auto_ptr.h:
+/usr/include/c++/13/ext/type_traits.h:
-/usr/include/sched.h:
+/usr/include/c++/13/x86_64-redhat-linux/bits/c++allocator.h:
-/usr/include/pthread.h:
+/usr/include/c++/13/ext/string_conversions.h:
-/usr/include/c++/12/bits/ios_base.h:
+/usr/include/c++/13/ext/numeric_traits.h:
-/usr/include/c++/12/streambuf:
+third_party/uri/src/detail/uri_resolve.hpp:
-/usr/include/c++/12/vector:
+/usr/include/c++/13/ext/concurrence.h:
-/usr/include/bits/sched.h:
+/usr/include/c++/13/new:
-/usr/include/c++/12/bits/streambuf_iterator.h:
+/usr/include/c++/13/ext/alloc_traits.h:
-/usr/include/c++/12/bits/stream_iterator.h:
+/usr/include/locale.h:
-/usr/include/c++/12/iterator:
+/usr/include/c++/13/ext/aligned_buffer.h:
-/usr/include/c++/12/bits/hash_bytes.h:
+/usr/include/gnu/stubs-64.h:
-/usr/include/bits/types/error_t.h:
+/usr/include/c++/13/debug/debug.h:
-/usr/include/asm-generic/errno-base.h:
+/usr/include/c++/13/debug/assertions.h:
-/usr/include/asm-generic/errno.h:
+/usr/include/c++/13/cwchar:
-third_party/uri/include/network/uri/detail/translate.hpp:
+/usr/include/c++/13/cstdint:
-/usr/include/asm/errno.h:
+/usr/include/c++/13/bits/std_function.h:
-/usr/include/linux/errno.h:
+/usr/include/c++/13/cstdlib:
-/usr/include/wctype.h:
+/usr/include/c++/13/bits/uniform_int_dist.h:
-/usr/include/bits/timex.h:
+/usr/include/c++/13/bits/stringfwd.h:
-/usr/include/bits/errno.h:
+/usr/include/c++/13/cassert:
-/usr/include/c++/12/backward/binders.h:
+/usr/include/bits/types/time_t.h:
-/usr/include/c++/12/x86_64-redhat-linux/bits/c++locale.h:
+/usr/include/c++/13/cerrno:
-/usr/include/c++/12/bits/localefwd.h:
+/usr/include/bits/types/struct_tm.h:
-/usr/include/c++/12/bits/cpp_type_traits.h:
+/usr/include/c++/13/ext/atomicity.h:
-/usr/include/c++/12/bits/allocator.h:
+/usr/include/c++/13/cctype:
-/usr/include/c++/12/bits/exception_defines.h:
+/usr/include/bits/wchar.h:
-/usr/include/locale.h:
+/usr/include/bits/types/struct_timespec.h:
-/usr/include/bits/types/wint_t.h:
+/usr/include/c++/13/bits/stl_bvector.h:
-third_party/uri/include/network/uri/uri_errors.hpp:
+/usr/include/sys/select.h:
-/usr/include/c++/12/bits/locale_classes.tcc:
+/usr/include/c++/13/bits/allocator.h:
-/usr/include/c++/12/bits/exception.h:
+/usr/include/c++/13/bits/locale_classes.tcc:
-/usr/include/bits/stdint-uintn.h:
+/usr/include/bits/types/struct_sched_param.h:
-/usr/include/c++/12/ext/concurrence.h:
+/usr/include/ctype.h:
-/usr/include/endian.h:
+/usr/include/bits/waitflags.h:
-/usr/include/bits/types/cookie_io_functions_t.h:
+third_party/uri/src/uri_builder.cpp:
-/usr/include/c++/12/memory:
+/usr/include/c++/13/locale:
-/usr/include/bits/stdint-intn.h:
+/usr/include/c++/13/bits/stl_uninitialized.h:
-/usr/include/strings.h:
+/usr/include/bits/types/struct_FILE.h:
-/usr/include/c++/12/ext/atomicity.h:
+/usr/include/bits/types/locale_t.h:
-/usr/include/c++/12/string:
+/usr/include/c++/13/x86_64-redhat-linux/bits/os_defines.h:
-/usr/include/c++/12/bits/shared_ptr.h:
+/usr/include/c++/13/bits/stl_heap.h:
-/usr/include/c++/12/initializer_list:
+/usr/include/bits/types/cookie_io_functions_t.h:
-third_party/uri/src/uri_builder.cpp:
+/usr/include/bits/sched.h:
-/usr/include/c++/12/new:
+/usr/include/bits/types/clockid_t.h:
-/usr/include/bits/typesizes.h:
+/usr/include/bits/atomic_wide_counter.h:
-/usr/include/bits/uintn-identity.h:
+/usr/include/c++/13/clocale:
-/usr/include/bits/types.h:
+/usr/include/c++/13/bits/allocated_ptr.h:
-/usr/include/stdint.h:
+/usr/include/bits/types/__locale_t.h:
-/usr/include/c++/12/bits/char_traits.h:
+/usr/include/bits/types/__FILE.h:
-/usr/include/c++/12/bits/stl_relops.h:
+/usr/include/c++/13/bits/char_traits.h:
-/usr/include/c++/12/cstdint:
+/usr/include/c++/13/bits/codecvt.h:
/usr/include/bits/types/FILE.h:
-/usr/include/c++/12/x86_64-redhat-linux/bits/os_defines.h:
+/usr/include/bits/types.h:
-/usr/include/c++/12/exception:
+/usr/include/bits/types/error_t.h:
-/usr/lib/gcc/x86_64-redhat-linux/12/include/stddef.h:
+/usr/include/bits/stdint-intn.h:
-/usr/include/c++/12/x86_64-redhat-linux/bits/gthr-default.h:
+third_party/uri/include/network/uri/detail/translate.hpp:
-/usr/include/gnu/stubs-64.h:
+/usr/include/asm/errno.h:
-/usr/include/bits/long-double.h:
+/usr/include/bits/thread-shared-types.h:
-/usr/include/c++/12/x86_64-redhat-linux/bits/cpu_defines.h:
+/usr/include/features.h:
-/usr/include/c++/12/bits/algorithmfwd.h:
+/usr/include/bits/endianness.h:
-/usr/include/bits/stdlib-float.h:
+/usr/include/c++/13/bits/unique_ptr.h:
-/usr/include/bits/time64.h:
+/usr/include/c++/13/bits/align.h:
-/usr/include/bits/types/__sigset_t.h:
+/usr/include/bits/struct_mutex.h:
-third_party/uri/include/network/uri/detail/uri_parts.hpp:
+/usr/include/c++/13/bits/stl_vector.h:
-/usr/include/c++/12/cstddef:
+/usr/include/bits/cpu-set.h:
-/usr/include/c++/12/bits/new_allocator.h:
+/usr/include/bits/typesizes.h:
-/usr/include/bits/wordsize.h:
+/usr/include/bits/uintn-identity.h:
-/usr/include/c++/12/bits/postypes.h:
+/usr/include/c++/13/iosfwd:
-/usr/lib/gcc/x86_64-redhat-linux/12/include/stdint.h:
+/usr/include/c++/13/bits/predefined_ops.h:
-third_party/uri/include/network/string_view.hpp:
+/usr/include/bits/long-double.h:
-/usr/include/bits/types/sigset_t.h:
+/usr/include/bits/stdlib-float.h:
-/usr/include/c++/12/x86_64-redhat-linux/bits/gthr.h:
+/usr/include/bits/time64.h:
-/usr/include/c++/12/type_traits:
+/usr/include/bits/stdio_lim.h:
-/usr/include/c++/12/x86_64-redhat-linux/bits/ctype_base.h:
+/usr/include/bits/types/__mbstate_t.h:
-/usr/include/bits/endian.h:
+/usr/include/bits/time.h:
-/usr/include/c++/12/cstdio:
+third_party/uri/src/detail/uri_advance_parts.hpp:
-/usr/include/c++/12/ext/string_conversions.h:
+/usr/include/c++/13/string:
-third_party/uri/include/network/uri/detail/decode.hpp:
+/usr/include/bits/byteswap.h:
-/usr/include/c++/12/bits/align.h:
+/usr/include/bits/struct_rwlock.h:
-/usr/include/gnu/stubs.h:
+/usr/include/bits/types/struct_itimerspec.h:
-/usr/include/bits/pthreadtypes-arch.h:
+/usr/include/c++/13/bits/ptr_traits.h:
-/usr/include/c++/12/iosfwd:
+/usr/include/c++/13/bits/stl_construct.h:
-/usr/include/c++/12/utility:
+/usr/include/c++/13/x86_64-redhat-linux/bits/c++config.h:
-/usr/include/stdc-predef.h:
+/usr/include/alloca.h:
-/usr/include/c++/12/bits/move.h:
+/usr/include/c++/13/x86_64-redhat-linux/bits/messages_members.h:
-/usr/include/c++/12/x86_64-redhat-linux/bits/c++allocator.h:
+/usr/include/c++/13/bit:
-/usr/include/c++/12/bits/charconv.h:
+/usr/include/c++/13/bits/basic_string.tcc:
-/usr/include/bits/pthreadtypes.h:
+/usr/include/c++/13/bits/vector.tcc:
-third_party/uri/src/detail/uri_normalize.hpp:
+/usr/include/bits/locale.h:
-/usr/include/c++/12/ext/alloc_traits.h:
+/usr/include/c++/13/algorithm:
-third_party/uri/src/detail/uri_advance_parts.cpp:
+/usr/include/c++/13/bits/stl_raw_storage_iter.h:
-third_party/uri/src/detail/algorithm.hpp:
+/usr/include/c++/13/bits/stream_iterator.h:
-/usr/include/c++/12/bits/stringfwd.h:
+third_party/uri/src/detail/uri_parse_authority.cpp:
-/usr/include/bits/floatn.h:
+/usr/include/c++/13/functional:
-/usr/include/c++/12/x86_64-redhat-linux/bits/atomic_word.h:
+/usr/include/bits/setjmp.h:
-/usr/include/c++/12/bits/memoryfwd.h:
+/usr/include/bits/types/struct___jmp_buf_tag.h:
-/usr/include/bits/wctype-wchar.h:
+/usr/include/bits/types/clock_t.h:
-/usr/include/sys/types.h:
+/usr/include/bits/types/__fpos_t.h:
-/usr/include/bits/locale.h:
+/usr/include/c++/13/bits/stl_iterator_base_types.h:
-/usr/include/c++/12/cwchar:
+/usr/include/asm-generic/errno-base.h:
-/usr/include/wchar.h:
+/usr/include/c++/13/bits/hash_bytes.h:
-/usr/include/c++/12/x86_64-redhat-linux/bits/messages_members.h:
+/usr/include/assert.h:
-/usr/include/c++/12/bits/alloc_traits.h:
+/usr/include/bits/types/__sigset_t.h:
-/usr/include/bits/types/mbstate_t.h:
+/usr/include/c++/13/backward/auto_ptr.h:
-third_party/uri/src/detail/algorithm_split.hpp:
+third_party/uri/src/detail/uri_normalize.hpp:
-/usr/include/c++/12/bits/stl_iterator.h:
+third_party/uri/src/detail/uri_advance_parts.cpp:
-/usr/include/c++/12/bits/utility.h:
+/usr/include/c++/13/bits/ios_base.h:
-/usr/include/bits/floatn-common.h:
+/usr/include/bits/floatn.h:
-/usr/include/c++/12/bits/uses_allocator.h:
+/usr/include/bits/pthreadtypes.h:
-/usr/include/sys/cdefs.h:
+/usr/include/bits/libc-header-start.h:
-/usr/include/c++/12/bits/stl_iterator_base_funcs.h:
+/usr/include/wctype.h:
-/usr/include/bits/libc-header-start.h:
+/usr/include/c++/13/exception:
-third_party/uri/include/network/optional.hpp:
+/usr/include/bits/errno.h:
-/usr/lib/gcc/x86_64-redhat-linux/12/include/stdarg.h:
+/usr/include/bits/timex.h:
-/usr/include/bits/wchar.h:
+/usr/include/c++/13/bits/shared_ptr_atomic.h:
-/usr/include/bits/types/locale_t.h:
+/usr/include/bits/pthread_stack_min-dynamic.h:
-/usr/include/c++/12/bits/atomic_base.h:
+/usr/include/endian.h:
-/usr/include/c++/12/stdexcept:
+/usr/include/c++/13/bits/streambuf.tcc:
-/usr/include/features-time64.h:
+third_party/uri/include/network/uri/detail/decode.hpp:
-/usr/include/c++/12/cctype:
+/usr/include/gnu/stubs.h:
-/usr/include/bits/waitflags.h:
+/usr/include/bits/pthreadtypes-arch.h:
-/usr/include/ctype.h:
+/usr/include/libintl.h:
-/usr/include/bits/types/__locale_t.h:
+/usr/include/c++/13/bits/basic_string.h:
-/usr/include/c++/12/bits/stl_algobase.h:
+/usr/include/bits/stdio.h:
-/usr/include/features.h:
+/usr/include/bits/types/timer_t.h:
-/usr/include/bits/endianness.h:
+/usr/include/c++/13/cwctype:
-third_party/uri/src/detail/uri_normalize.cpp:
+/usr/include/bits/types/wint_t.h:
-/usr/include/c++/12/bits/ostream_insert.h:
+/usr/include/bits/timesize.h:
-/usr/include/c++/12/bits/cxxabi_forced.h:
+/usr/include/c++/13/bits/shared_ptr.h:
-/usr/include/c++/12/bits/stl_iterator_base_types.h:
+/usr/include/bits/waitstatus.h:
-/usr/include/bits/struct_mutex.h:
+/usr/include/c++/13/bits/streambuf_iterator.h:
-/usr/include/bits/types/__FILE.h:
+/usr/include/bits/wordsize.h:
-/usr/include/c++/12/bits/concept_check.h:
+third_party/uri/include/network/string_view.hpp:
-/usr/include/c++/12/debug/debug.h:
+/usr/include/bits/types/sigset_t.h:
-/usr/include/c++/12/bits/uniform_int_dist.h:
+/usr/include/c++/13/bits/move.h:
-/usr/include/c++/12/x86_64-redhat-linux/bits/error_constants.h:
+third_party/uri/src/detail/uri_parse.hpp:
-/usr/include/c++/12/bits/std_abs.h:
+/usr/include/c++/13/bits/utility.h:
-/usr/include/c++/12/debug/assertions.h:
+/usr/include/c++/13/bits/stl_function.h:
-/usr/include/c++/12/bits/ptr_traits.h:
+/usr/include/bits/select.h:
-/usr/include/bits/types/time_t.h:
+/usr/include/c++/13/backward/binders.h:
-/usr/include/bits/types/struct_itimerspec.h:
+/usr/include/c++/13/bits/algorithmfwd.h:
-/usr/include/bits/struct_rwlock.h:
+/usr/include/bits/types/struct_timeval.h:
-/usr/include/c++/12/bits/std_function.h:
+/usr/include/c++/13/bits/concept_check.h:
-/usr/include/c++/12/bits/stl_function.h:
+/usr/include/c++/13/bits/alloc_traits.h:
-third_party/uri/include/network/uri/uri_builder.hpp:
+/usr/include/c++/13/x86_64-redhat-linux/bits/gthr.h:
-/usr/include/c++/12/ext/numeric_traits.h:
+/usr/include/bits/types/mbstate_t.h:
-/usr/include/c++/12/x86_64-redhat-linux/bits/ctype_inline.h:
+/usr/include/c++/13/bits/atomic_lockfree_defines.h:
-/usr/include/c++/12/bits/stl_pair.h:
+/usr/include/c++/13/bits/cpp_type_traits.h:
-/usr/include/c++/12/cstdlib:
+/usr/include/c++/13/bits/cxxabi_forced.h:
-/usr/include/bits/thread-shared-types.h:
+/usr/include/c++/13/typeinfo:
-/usr/include/c++/12/bits/stl_construct.h:
+/usr/include/c++/13/bits/cxxabi_init_exception.h:
-/usr/include/c++/12/bits/vector.tcc:
+/usr/include/c++/13/streambuf:
-/usr/include/c++/12/bits/functexcept.h:
+/usr/include/c++/13/bits/exception.h:
-/usr/include/c++/12/bits/predefined_ops.h:
+/usr/include/c++/13/cstdio:
-/usr/include/c++/12/bits/invoke.h:
+/usr/include/c++/13/bits/charconv.h:
-/usr/include/time.h:
+/usr/include/c++/13/bits/stl_pair.h:
-/usr/include/c++/12/bits/range_access.h:
+third_party/uri/include/network/uri/uri_builder.hpp:
-third_party/uri/src/detail/uri_parse.hpp:
+/usr/include/c++/13/bits/exception_defines.h:
-/usr/include/c++/12/ext/type_traits.h:
+/usr/include/c++/13/bits/localefwd.h:
-/usr/include/c++/12/bits/basic_string.h:
+/usr/include/c++/13/bits/exception_ptr.h:
-/usr/include/stdlib.h:
+/usr/include/c++/13/bits/stl_iterator.h:
-/usr/include/bits/timesize.h:
+/usr/include/bits/types/__fpos64_t.h:
-/usr/include/bits/waitstatus.h:
+/usr/include/c++/13/bits/functexcept.h:
-/usr/include/bits/types/clockid_t.h:
+/usr/include/errno.h:
-/usr/include/bits/atomic_wide_counter.h:
+/usr/include/c++/13/bits/functional_hash.h:
-/usr/include/c++/12/x86_64-redhat-linux/bits/c++config.h:
+/usr/include/c++/13/bits/invoke.h:
-/usr/include/errno.h:
+/usr/include/c++/13/bits/locale_classes.h:
-/usr/include/bits/types/timer_t.h:
+/usr/include/time.h:
-/usr/include/c++/12/bits/functional_hash.h:
+/usr/include/c++/13/bits/memoryfwd.h:
-/usr/include/stdio.h:
+/usr/include/c++/13/bits/nested_exception.h:
-third_party/uri/src/detail/uri_advance_parts.hpp:
+/usr/include/c++/13/bits/atomic_base.h:
-/usr/include/bits/byteswap.h:
+/usr/include/c++/13/bits/new_allocator.h:
-/usr/include/sys/select.h:
+/usr/include/c++/13/bits/ostream_insert.h:
-/usr/include/c++/12/bits/locale_facets_nonio.h:
+/usr/include/c++/13/system_error:
-/usr/include/bits/select.h:
+/usr/include/c++/13/bits/range_access.h:
-/usr/include/c++/12/bits/basic_string.tcc:
+/usr/include/bits/stdint-uintn.h:
-/usr/include/bits/types/struct_timeval.h:
+/usr/include/c++/13/bits/refwrap.h:
-/usr/include/bits/time.h:
+/usr/include/c++/13/bits/locale_facets.tcc:
-/usr/include/bits/types/__mbstate_t.h:
+/usr/include/bits/stdlib-bsearch.h:
-/usr/include/bits/stdio_lim.h:
+/usr/include/c++/13/bits/requires_hosted.h:
-/usr/include/bits/types/struct_timespec.h:
+/usr/include/bits/floatn-common.h:
-/usr/include/alloca.h:
+/usr/include/c++/13/bits/shared_ptr_base.h:
-/usr/include/bits/stdlib-bsearch.h:
+/usr/include/c++/13/x86_64-redhat-linux/bits/error_constants.h:
-/usr/include/c++/12/bits/shared_ptr_base.h:
+/usr/include/c++/13/bits/uses_allocator.h:
-/usr/include/bits/types/clock_t.h:
+/usr/include/c++/13/bits/postypes.h:
-/usr/include/bits/types/__fpos_t.h:
+/usr/include/c++/13/bits/std_abs.h:
-/usr/include/c++/12/clocale:
+/usr/include/c++/13/cstddef:
-/usr/include/bits/types/__fpos64_t.h:
+/usr/include/c++/13/bits/stl_algo.h:
-/usr/include/bits/types/struct_FILE.h:
+/usr/include/c++/13/bits/stl_algobase.h:
-/usr/include/bits/stdio.h:
+/usr/include/asm-generic/errno.h:
+
+/usr/include/c++/13/bits/stl_iterator_base_funcs.h:
-/usr/include/c++/12/bits/refwrap.h:
+/usr/include/c++/13/bits/stl_relops.h:
+
+/usr/include/bits/endian.h:
-/usr/include/c++/12/cerrno:
+/usr/include/c++/13/bits/stl_tempbuf.h:
diff --git a/Build/source/utils/asymptote/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/flags.make b/Build/source/utils/asymptote/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/flags.make
index a977a075c62..6f4ffc34f35 100644
--- a/Build/source/utils/asymptote/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/flags.make
+++ b/Build/source/utils/asymptote/LspCpp/third_party/uri/src/CMakeFiles/network-uri.dir/flags.make
@@ -1,10 +1,10 @@
# CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.25
+# Generated by "Unix Makefiles" Generator, CMake Version 3.27
# compile CXX with /bin/c++
CXX_DEFINES =
-CXX_INCLUDES = -I/usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src -I/usr/local/src/asymptote-2.85/LspCpp/third_party/uri/include
+CXX_INCLUDES = -I/usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src -I/usr/local/src/asymptote-2.87/LspCpp/third_party/uri/include
-CXX_FLAGS = -fPIE -D_FILE_OFFSET_BIS=64 -DUSEGC -I../gc-8.2.0/include -std=c++11 -Wall -Werror -Wno-parentheses -O2 -g -DNDEBUG
+CXX_FLAGS = -fPIE -D_FILE_OFFSET_BIS=64 -DUSEGC -DLSPCPP_USEGC -I../gc-8.2.4/include -std=c++11 -Wall -Werror -Wno-parentheses -O2 -g -DNDEBUG
diff --git a/Build/source/utils/asymptote/LspCpp/third_party/uri/src/Makefile b/Build/source/utils/asymptote/LspCpp/third_party/uri/src/Makefile
index 9913f5cc910..1536765f889 100644
--- a/Build/source/utils/asymptote/LspCpp/third_party/uri/src/Makefile
+++ b/Build/source/utils/asymptote/LspCpp/third_party/uri/src/Makefile
@@ -1,5 +1,5 @@
# CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 3.25
+# Generated by "Unix Makefiles" Generator, CMake Version 3.27
# Default target executed when no arguments are given to make.
default_target: all
@@ -60,17 +60,17 @@ RM = /usr/bin/cmake -E rm -f
EQUALS = =
# The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /usr/local/src/asymptote-2.85/LspCpp
+CMAKE_SOURCE_DIR = /usr/local/src/asymptote-2.87/LspCpp
# The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /usr/local/src/asymptote-2.85/LspCpp
+CMAKE_BINARY_DIR = /usr/local/src/asymptote-2.87/LspCpp
#=============================================================================
# Targets provided globally by CMake.
# Special rule for the target edit_cache
edit_cache:
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Running CMake cache editor..."
/usr/bin/ccmake -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
.PHONY : edit_cache
@@ -80,7 +80,7 @@ edit_cache/fast: edit_cache
# Special rule for the target rebuild_cache
rebuild_cache:
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Running CMake to regenerate build system..."
/usr/bin/cmake --regenerate-during-build -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
.PHONY : rebuild_cache
@@ -90,7 +90,7 @@ rebuild_cache/fast: rebuild_cache
# Special rule for the target list_install_components
list_install_components:
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Available install components are: \"Unspecified\""
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Available install components are: \"Unspecified\""
.PHONY : list_install_components
# Special rule for the target list_install_components
@@ -99,50 +99,50 @@ list_install_components/fast: list_install_components
# Special rule for the target install
install: preinstall
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Install the project..."
/usr/bin/cmake -P cmake_install.cmake
.PHONY : install
# Special rule for the target install
install/fast: preinstall/fast
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Install the project..."
/usr/bin/cmake -P cmake_install.cmake
.PHONY : install/fast
# Special rule for the target install/local
install/local: preinstall
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Installing only the local directory..."
/usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
.PHONY : install/local
# Special rule for the target install/local
install/local/fast: preinstall/fast
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Installing only the local directory..."
/usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
.PHONY : install/local/fast
# Special rule for the target install/strip
install/strip: preinstall
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Installing the project stripped..."
/usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
.PHONY : install/strip
# Special rule for the target install/strip
install/strip/fast: preinstall/fast
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
+ @$(CMAKE_COMMAND) -E cmake_echo_color "--switch=$(COLOR)" --cyan "Installing the project stripped..."
/usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
.PHONY : install/strip/fast
# The main all target
all: cmake_check_build_system
- cd /usr/local/src/asymptote-2.85/LspCpp && $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/src/asymptote-2.85/LspCpp/CMakeFiles /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src//CMakeFiles/progress.marks
- cd /usr/local/src/asymptote-2.85/LspCpp && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 third_party/uri/src/all
- $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/src/asymptote-2.85/LspCpp/CMakeFiles 0
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/src/asymptote-2.87/LspCpp/CMakeFiles /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src//CMakeFiles/progress.marks
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 third_party/uri/src/all
+ $(CMAKE_COMMAND) -E cmake_progress_start /usr/local/src/asymptote-2.87/LspCpp/CMakeFiles 0
.PHONY : all
# The main clean target
clean:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 third_party/uri/src/clean
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 third_party/uri/src/clean
.PHONY : clean
# The main clean target
@@ -151,22 +151,22 @@ clean/fast: clean
# Prepare targets for installation.
preinstall: all
- cd /usr/local/src/asymptote-2.85/LspCpp && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 third_party/uri/src/preinstall
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 third_party/uri/src/preinstall
.PHONY : preinstall
# Prepare targets for installation.
preinstall/fast:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 third_party/uri/src/preinstall
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 third_party/uri/src/preinstall
.PHONY : preinstall/fast
# clear depends
depend:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
.PHONY : depend
# Convenience name for target.
third_party/uri/src/CMakeFiles/network-uri.dir/rule:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 third_party/uri/src/CMakeFiles/network-uri.dir/rule
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(MAKE) $(MAKESILENT) -f CMakeFiles/Makefile2 third_party/uri/src/CMakeFiles/network-uri.dir/rule
.PHONY : third_party/uri/src/CMakeFiles/network-uri.dir/rule
# Convenience name for target.
@@ -175,7 +175,7 @@ network-uri: third_party/uri/src/CMakeFiles/network-uri.dir/rule
# fast build rule for target.
network-uri/fast:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/build
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/build
.PHONY : network-uri/fast
detail/uri_advance_parts.o: detail/uri_advance_parts.cpp.o
@@ -183,7 +183,7 @@ detail/uri_advance_parts.o: detail/uri_advance_parts.cpp.o
# target to build an object file
detail/uri_advance_parts.cpp.o:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.o
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.o
.PHONY : detail/uri_advance_parts.cpp.o
detail/uri_advance_parts.i: detail/uri_advance_parts.cpp.i
@@ -191,7 +191,7 @@ detail/uri_advance_parts.i: detail/uri_advance_parts.cpp.i
# target to preprocess a source file
detail/uri_advance_parts.cpp.i:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.i
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.i
.PHONY : detail/uri_advance_parts.cpp.i
detail/uri_advance_parts.s: detail/uri_advance_parts.cpp.s
@@ -199,7 +199,7 @@ detail/uri_advance_parts.s: detail/uri_advance_parts.cpp.s
# target to generate assembly for a file
detail/uri_advance_parts.cpp.s:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.s
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_advance_parts.cpp.s
.PHONY : detail/uri_advance_parts.cpp.s
detail/uri_normalize.o: detail/uri_normalize.cpp.o
@@ -207,7 +207,7 @@ detail/uri_normalize.o: detail/uri_normalize.cpp.o
# target to build an object file
detail/uri_normalize.cpp.o:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.o
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.o
.PHONY : detail/uri_normalize.cpp.o
detail/uri_normalize.i: detail/uri_normalize.cpp.i
@@ -215,7 +215,7 @@ detail/uri_normalize.i: detail/uri_normalize.cpp.i
# target to preprocess a source file
detail/uri_normalize.cpp.i:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.i
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.i
.PHONY : detail/uri_normalize.cpp.i
detail/uri_normalize.s: detail/uri_normalize.cpp.s
@@ -223,7 +223,7 @@ detail/uri_normalize.s: detail/uri_normalize.cpp.s
# target to generate assembly for a file
detail/uri_normalize.cpp.s:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.s
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_normalize.cpp.s
.PHONY : detail/uri_normalize.cpp.s
detail/uri_parse.o: detail/uri_parse.cpp.o
@@ -231,7 +231,7 @@ detail/uri_parse.o: detail/uri_parse.cpp.o
# target to build an object file
detail/uri_parse.cpp.o:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse.cpp.o
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse.cpp.o
.PHONY : detail/uri_parse.cpp.o
detail/uri_parse.i: detail/uri_parse.cpp.i
@@ -239,7 +239,7 @@ detail/uri_parse.i: detail/uri_parse.cpp.i
# target to preprocess a source file
detail/uri_parse.cpp.i:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse.cpp.i
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse.cpp.i
.PHONY : detail/uri_parse.cpp.i
detail/uri_parse.s: detail/uri_parse.cpp.s
@@ -247,7 +247,7 @@ detail/uri_parse.s: detail/uri_parse.cpp.s
# target to generate assembly for a file
detail/uri_parse.cpp.s:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse.cpp.s
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse.cpp.s
.PHONY : detail/uri_parse.cpp.s
detail/uri_parse_authority.o: detail/uri_parse_authority.cpp.o
@@ -255,7 +255,7 @@ detail/uri_parse_authority.o: detail/uri_parse_authority.cpp.o
# target to build an object file
detail/uri_parse_authority.cpp.o:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.o
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.o
.PHONY : detail/uri_parse_authority.cpp.o
detail/uri_parse_authority.i: detail/uri_parse_authority.cpp.i
@@ -263,7 +263,7 @@ detail/uri_parse_authority.i: detail/uri_parse_authority.cpp.i
# target to preprocess a source file
detail/uri_parse_authority.cpp.i:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.i
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.i
.PHONY : detail/uri_parse_authority.cpp.i
detail/uri_parse_authority.s: detail/uri_parse_authority.cpp.s
@@ -271,7 +271,7 @@ detail/uri_parse_authority.s: detail/uri_parse_authority.cpp.s
# target to generate assembly for a file
detail/uri_parse_authority.cpp.s:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.s
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_parse_authority.cpp.s
.PHONY : detail/uri_parse_authority.cpp.s
detail/uri_resolve.o: detail/uri_resolve.cpp.o
@@ -279,7 +279,7 @@ detail/uri_resolve.o: detail/uri_resolve.cpp.o
# target to build an object file
detail/uri_resolve.cpp.o:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.o
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.o
.PHONY : detail/uri_resolve.cpp.o
detail/uri_resolve.i: detail/uri_resolve.cpp.i
@@ -287,7 +287,7 @@ detail/uri_resolve.i: detail/uri_resolve.cpp.i
# target to preprocess a source file
detail/uri_resolve.cpp.i:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.i
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.i
.PHONY : detail/uri_resolve.cpp.i
detail/uri_resolve.s: detail/uri_resolve.cpp.s
@@ -295,7 +295,7 @@ detail/uri_resolve.s: detail/uri_resolve.cpp.s
# target to generate assembly for a file
detail/uri_resolve.cpp.s:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.s
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/detail/uri_resolve.cpp.s
.PHONY : detail/uri_resolve.cpp.s
uri.o: uri.cpp.o
@@ -303,7 +303,7 @@ uri.o: uri.cpp.o
# target to build an object file
uri.cpp.o:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/uri.cpp.o
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/uri.cpp.o
.PHONY : uri.cpp.o
uri.i: uri.cpp.i
@@ -311,7 +311,7 @@ uri.i: uri.cpp.i
# target to preprocess a source file
uri.cpp.i:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/uri.cpp.i
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/uri.cpp.i
.PHONY : uri.cpp.i
uri.s: uri.cpp.s
@@ -319,7 +319,7 @@ uri.s: uri.cpp.s
# target to generate assembly for a file
uri.cpp.s:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/uri.cpp.s
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/uri.cpp.s
.PHONY : uri.cpp.s
uri_builder.o: uri_builder.cpp.o
@@ -327,7 +327,7 @@ uri_builder.o: uri_builder.cpp.o
# target to build an object file
uri_builder.cpp.o:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/uri_builder.cpp.o
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/uri_builder.cpp.o
.PHONY : uri_builder.cpp.o
uri_builder.i: uri_builder.cpp.i
@@ -335,7 +335,7 @@ uri_builder.i: uri_builder.cpp.i
# target to preprocess a source file
uri_builder.cpp.i:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/uri_builder.cpp.i
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/uri_builder.cpp.i
.PHONY : uri_builder.cpp.i
uri_builder.s: uri_builder.cpp.s
@@ -343,7 +343,7 @@ uri_builder.s: uri_builder.cpp.s
# target to generate assembly for a file
uri_builder.cpp.s:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/uri_builder.cpp.s
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/uri_builder.cpp.s
.PHONY : uri_builder.cpp.s
uri_errors.o: uri_errors.cpp.o
@@ -351,7 +351,7 @@ uri_errors.o: uri_errors.cpp.o
# target to build an object file
uri_errors.cpp.o:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/uri_errors.cpp.o
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/uri_errors.cpp.o
.PHONY : uri_errors.cpp.o
uri_errors.i: uri_errors.cpp.i
@@ -359,7 +359,7 @@ uri_errors.i: uri_errors.cpp.i
# target to preprocess a source file
uri_errors.cpp.i:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/uri_errors.cpp.i
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/uri_errors.cpp.i
.PHONY : uri_errors.cpp.i
uri_errors.s: uri_errors.cpp.s
@@ -367,7 +367,7 @@ uri_errors.s: uri_errors.cpp.s
# target to generate assembly for a file
uri_errors.cpp.s:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/uri_errors.cpp.s
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(MAKE) $(MAKESILENT) -f third_party/uri/src/CMakeFiles/network-uri.dir/build.make third_party/uri/src/CMakeFiles/network-uri.dir/uri_errors.cpp.s
.PHONY : uri_errors.cpp.s
# Help Target
@@ -418,6 +418,6 @@ help:
# No rule that depends on this can have commands that come from listfiles
# because they might be regenerated.
cmake_check_build_system:
- cd /usr/local/src/asymptote-2.85/LspCpp && $(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+ cd /usr/local/src/asymptote-2.87/LspCpp && $(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
.PHONY : cmake_check_build_system
diff --git a/Build/source/utils/asymptote/LspCpp/third_party/uri/src/cmake_install.cmake b/Build/source/utils/asymptote/LspCpp/third_party/uri/src/cmake_install.cmake
index bdaabf2bd4d..b34952d92ba 100644
--- a/Build/source/utils/asymptote/LspCpp/third_party/uri/src/cmake_install.cmake
+++ b/Build/source/utils/asymptote/LspCpp/third_party/uri/src/cmake_install.cmake
@@ -1,4 +1,4 @@
-# Install script for directory: /usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src
+# Install script for directory: /usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src
# Set the install prefix
if(NOT DEFINED CMAKE_INSTALL_PREFIX)
@@ -43,6 +43,6 @@ if(NOT DEFINED CMAKE_OBJDUMP)
endif()
if(CMAKE_INSTALL_COMPONENT STREQUAL "Unspecified" OR NOT CMAKE_INSTALL_COMPONENT)
- file(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/lib" TYPE STATIC_LIBRARY FILES "/usr/local/src/asymptote-2.85/LspCpp/third_party/uri/src/libnetwork-uri.a")
+ file(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/lib" TYPE STATIC_LIBRARY FILES "/usr/local/src/asymptote-2.87/LspCpp/third_party/uri/src/libnetwork-uri.a")
endif()
diff --git a/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/CMakeLists.txt b/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/CMakeLists.txt
index f1a2e1f1e91..c8d4b7a3c58 100644
--- a/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/CMakeLists.txt
+++ b/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/CMakeLists.txt
@@ -1,5 +1,5 @@
cmake_minimum_required (VERSION 3.0.2)
-project (utf8cpp VERSION 3.2 LANGUAGES CXX)
+project (utf8cpp VERSION 3.2.2 LANGUAGES CXX)
if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
set(IS_ROOT_PROJECT ON)
@@ -19,6 +19,7 @@ target_include_directories(utf8cpp INTERFACE
add_library(utf8::cpp ALIAS utf8cpp)
if(UTF8_INSTALL)
+ include(CMakePackageConfigHelpers)
if(MSVC)
set(DEF_INSTALL_CMAKE_DIR CMake)
else()
@@ -26,9 +27,28 @@ if(UTF8_INSTALL)
set(DEF_INSTALL_CMAKE_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/utf8cpp)
endif()
+ write_basic_package_version_file(
+ ${CMAKE_CURRENT_BINARY_DIR}/utf8cppConfigVersion.cmake
+ VERSION ${PROJECT_VERSION}
+ COMPATIBILITY SameMajorVersion
+ )
+
+ configure_package_config_file(
+ ${PROJECT_SOURCE_DIR}/utf8cppConfig.cmake.in
+ ${CMAKE_CURRENT_BINARY_DIR}/utf8cppConfig.cmake
+ INSTALL_DESTINATION ${DEF_INSTALL_CMAKE_DIR}
+ )
+
install(DIRECTORY source/ DESTINATION include/utf8cpp)
- install(TARGETS utf8cpp EXPORT utf8cppConfig)
- install(EXPORT utf8cppConfig DESTINATION ${DEF_INSTALL_CMAKE_DIR})
+ install(TARGETS utf8cpp EXPORT utf8cppTargets)
+ install(EXPORT utf8cppTargets DESTINATION ${DEF_INSTALL_CMAKE_DIR})
+ install(
+ FILES
+ ${CMAKE_CURRENT_BINARY_DIR}/utf8cppConfig.cmake
+ ${CMAKE_CURRENT_BINARY_DIR}/utf8cppConfigVersion.cmake
+ DESTINATION
+ ${DEF_INSTALL_CMAKE_DIR}
+ )
endif()
if(UTF8_SAMPLES)
diff --git a/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/README.md b/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/README.md
index a519cdb9633..02d9f75d93a 100644
--- a/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/README.md
+++ b/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/README.md
@@ -11,7 +11,7 @@ The purpose of this article is not to offer an introduction to Unicode in genera
## Examples of use
-### Introductionary Sample
+### Introductory Sample
To illustrate the use of the library, let's start with a small but complete program that opens a file containing UTF-8 encoded text, reads it line by line, checks each line for invalid UTF-8 byte sequences, and converts it to UTF-16 encoding and back to UTF-8:
@@ -149,7 +149,7 @@ The function will replace any invalid UTF-8 sequence with a Unicode replacement
The library was designed to be:
1. Generic: for better or worse, there are many C++ string classes out there, and the library should work with as many of them as possible.
-2. Portable: the library should be portable both accross different platforms and compilers. The only non-portable code is a small section that declares unsigned integers of different sizes: three typedefs. They can be changed by the users of the library if they don't match their platform. The default setting should work for Windows (both 32 and 64 bit), and most 32 bit and 64 bit Unix derivatives. Support for post C++03 language features is included for modern compilers at API level only, so the library should work even with pretty old compilers.
+2. Portable: the library should be portable both across different platforms and compilers. The only non-portable code is a small section that declares unsigned integers of different sizes: three typedefs. They can be changed by the users of the library if they don't match their platform. The default setting should work for Windows (both 32 and 64 bit), and most 32 bit and 64 bit Unix derivatives. Support for post C++03 language features is included for modern compilers at API level only, so the library should work even with pretty old compilers.
3. Lightweight: follow the "pay only for what you use" guideline.
4. Unintrusive: avoid forcing any particular design or even programming style on the user. This is a library, not a framework.
@@ -157,7 +157,7 @@ The library was designed to be:
In case you want to look into other means of working with UTF-8 strings from C++, here is the list of solutions I am aware of:
-1. [ICU Library](http://icu.sourceforge.net/). It is very powerful, complete, feature-rich, mature, and widely used. Also big, intrusive, non-generic, and doesn't play well with the Standard Library. I definitelly recommend looking at ICU even if you don't plan to use it.
+1. [ICU Library](http://icu.sourceforge.net/). It is very powerful, complete, feature-rich, mature, and widely used. Also big, intrusive, non-generic, and doesn't play well with the Standard Library. I definitely recommend looking at ICU even if you don't plan to use it.
2. C++11 language and library features. Still far from complete, and not easy to use.
3. [Glib::ustring](http://www.gtkmm.org/gtkmm2/docs/tutorial/html/ch03s04.html). A class specifically made to work with UTF-8 strings, and also feel like `std::string`. If you prefer to have yet another string class in your code, it may be worth a look. Be aware of the licensing issues, though.
4. Platform dependent solutions: Windows and POSIX have functions to convert strings from one encoding to another. That is only a subset of what my library offers, but if that is all you need it may be good enough.
@@ -247,7 +247,7 @@ assert (w == twochars + 3);
This function is typically used to iterate through a UTF-8 encoded string.
-In case of an invalid UTF-8 seqence, a `utf8::invalid_utf8` exception is thrown.
+In case of an invalid UTF-8 sequence, a `utf8::invalid_utf8` exception is thrown.
#### utf8::peek_next
@@ -276,7 +276,7 @@ assert (cp == 0x65e5);
assert (w == twochars);
```
-In case of an invalid UTF-8 seqence, a `utf8::invalid_utf8` exception is thrown.
+In case of an invalid UTF-8 sequence, a `utf8::invalid_utf8` exception is thrown.
#### utf8::prior
@@ -345,7 +345,7 @@ In case of an invalid code point, a `utf8::invalid_code_point` exception is thro
Available in version 1.0 and later.
-Given the iterators to two UTF-8 encoded code points in a seqence, returns the number of code points between them.
+Given the iterators to two UTF-8 encoded code points in a sequence, returns the number of code points between them.
```cpp
template <typename octet_iterator>
@@ -367,7 +367,7 @@ assert (dist == 2);
This function is used to find the length (in code points) of a UTF-8 encoded string. The reason it is called _distance_, rather than, say, _length_ is mainly because developers are used that _length_ is an O(1) function. Computing the length of an UTF-8 string is a linear operation, and it looked better to model it after `std::distance` algorithm.
-In case of an invalid UTF-8 seqence, a `utf8::invalid_utf8` exception is thrown. If `last` does not point to the past-of-end of a UTF-8 seqence, a `utf8::not_enough_room` exception is thrown.
+In case of an invalid UTF-8 sequence, a `utf8::invalid_utf8` exception is thrown. If `last` does not point to the past-of-end of a UTF-8 sequence, a `utf8::not_enough_room` exception is thrown.
#### utf8::utf16to8
@@ -469,7 +469,7 @@ assert (utf16result[2] == 0xd834);
assert (utf16result[3] == 0xdd1e);
```
-In case of an invalid UTF-8 seqence, a `utf8::invalid_utf8` exception is thrown.
+In case of an invalid UTF-8 sequence, a `utf8::invalid_utf8` exception is thrown.
#### utf8::utf8to16
@@ -494,7 +494,7 @@ assert (utf16result[2] == 0xd834);
assert (utf16result[3] == 0xdd1e);
```
-In case of an invalid UTF-8 seqence, a `utf8::invalid_utf8` exception is thrown.
+In case of an invalid UTF-8 sequence, a `utf8::invalid_utf8` exception is thrown.
#### utf8::utf8to16
@@ -525,7 +525,7 @@ assert (utf16result[2] == 0xd834);
assert (utf16result[3] == 0xdd1e);
```
-In case of an invalid UTF-8 seqence, a `utf8::invalid_utf8` exception is thrown. If `end` does not point to the past-of-end of a UTF-8 seqence, a `utf8::not_enough_room` exception is thrown.
+In case of an invalid UTF-8 sequence, a `utf8::invalid_utf8` exception is thrown. If `end` does not point to the past-of-end of a UTF-8 sequence, a `utf8::not_enough_room` exception is thrown.
#### utf8::utf32to8
@@ -625,7 +625,7 @@ u32string utf32result = utf8to32(twochars);
assert (utf32result.size() == 2);
```
-In case of an invalid UTF-8 seqence, a `utf8::invalid_utf8` exception is thrown.
+In case of an invalid UTF-8 sequence, a `utf8::invalid_utf8` exception is thrown.
#### utf8::utf8to32
@@ -648,7 +648,7 @@ u32string utf32result = utf8to32(twochars);
assert (utf32result.size() == 2);
```
-In case of an invalid UTF-8 seqence, a `utf8::invalid_utf8` exception is thrown.
+In case of an invalid UTF-8 sequence, a `utf8::invalid_utf8` exception is thrown.
#### utf8::utf8to32
@@ -678,7 +678,7 @@ utf8to32(twochars, twochars + 5, back_inserter(utf32result));
assert (utf32result.size() == 2);
```
-In case of an invalid UTF-8 seqence, a `utf8::invalid_utf8` exception is thrown. If `end` does not point to the past-of-end of a UTF-8 seqence, a `utf8::not_enough_room` exception is thrown.
+In case of an invalid UTF-8 sequence, a `utf8::invalid_utf8` exception is thrown. If `end` does not point to the past-of-end of a UTF-8 sequence, a `utf8::not_enough_room` exception is thrown.
#### utf8::find_invalid
@@ -824,7 +824,7 @@ bool bvalid = is_valid(utf_invalid, utf_invalid + 6);
assert (bvalid == false);
```
-`is_valid` is a shorthand for `find_invalid(start, end) == end;`. You may want to use it to make sure that a byte seqence is a valid UTF-8 string without the need to know where it fails if it is not valid.
+`is_valid` is a shorthand for `find_invalid(start, end) == end;`. You may want to use it to make sure that a byte sequence is a valid UTF-8 string without the need to know where it fails if it is not valid.
#### utf8::replace_invalid
@@ -1094,9 +1094,9 @@ class iterator;
`uint32_t operator * () const;` decodes the utf-8 sequence the underlying octet_iterator is pointing to and returns the code point.
-`bool operator == (const iterator& rhs) const;` returns `true` if the two underlaying iterators are equal.
+`bool operator == (const iterator& rhs) const;` returns `true` if the two underlying iterators are equal.
-`bool operator != (const iterator& rhs) const;` returns `true` if the two underlaying iterators are not equal.
+`bool operator != (const iterator& rhs) const;` returns `true` if the two underlying iterators are not equal.
`iterator& operator ++ ();` the prefix increment - moves the iterator to the next UTF-8 encoded code point.
@@ -1219,7 +1219,7 @@ This is a faster but less safe version of `utf8::peek_next`. It does not check f
Available in version 1.02 and later.
-Given a reference to an iterator pointing to an octet in a UTF-8 seqence, it decreases the iterator until it hits the beginning of the previous UTF-8 encoded code point and returns the 32 bits representation of the code point.
+Given a reference to an iterator pointing to an octet in a UTF-8 sequence, it decreases the iterator until it hits the beginning of the previous UTF-8 encoded code point and returns the 32 bits representation of the code point.
```cpp
template <typename octet_iterator>
@@ -1270,7 +1270,7 @@ This is a faster but less safe version of `utf8::advance`. It does not check for
Available in version 1.0 and later.
-Given the iterators to two UTF-8 encoded code points in a seqence, returns the number of code points between them.
+Given the iterators to two UTF-8 encoded code points in a sequence, returns the number of code points between them.
```cpp
template <typename octet_iterator>
@@ -1460,9 +1460,9 @@ class iterator;
`uint32_t operator * () const;` decodes the utf-8 sequence the underlying octet_iterator is pointing to and returns the code point.
-`bool operator == (const iterator& rhs) const;` returns `true` if the two underlaying iterators are equal.
+`bool operator == (const iterator& rhs) const;` returns `true` if the two underlying iterators are equal.
-`bool operator != (const iterator& rhs) const;` returns `true` if the two underlaying iterators are not equal.
+`bool operator != (const iterator& rhs) const;` returns `true` if the two underlying iterators are not equal.
`iterator& operator ++ ();` the prefix increment - moves the iterator to the next UTF-8 encoded code point.
diff --git a/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/source/utf8/checked.h b/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/source/utf8/checked.h
index 993b7f7c5f1..512dcc2fbac 100644
--- a/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/source/utf8/checked.h
+++ b/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/source/utf8/checked.h
@@ -50,6 +50,7 @@ namespace utf8
uint8_t u8;
public:
invalid_utf8 (uint8_t u) : u8(u) {}
+ invalid_utf8 (char c) : u8(static_cast<uint8_t>(c)) {}
virtual const char* what() const UTF_CPP_NOEXCEPT UTF_CPP_OVERRIDE { return "Invalid UTF-8"; }
uint8_t utf8_octet() const {return u8;}
};
@@ -75,24 +76,7 @@ namespace utf8
if (!utf8::internal::is_code_point_valid(cp))
throw invalid_code_point(cp);
- if (cp < 0x80) // one octet
- *(result++) = static_cast<uint8_t>(cp);
- else if (cp < 0x800) { // two octets
- *(result++) = static_cast<uint8_t>((cp >> 6) | 0xc0);
- *(result++) = static_cast<uint8_t>((cp & 0x3f) | 0x80);
- }
- else if (cp < 0x10000) { // three octets
- *(result++) = static_cast<uint8_t>((cp >> 12) | 0xe0);
- *(result++) = static_cast<uint8_t>(((cp >> 6) & 0x3f) | 0x80);
- *(result++) = static_cast<uint8_t>((cp & 0x3f) | 0x80);
- }
- else { // four octets
- *(result++) = static_cast<uint8_t>((cp >> 18) | 0xf0);
- *(result++) = static_cast<uint8_t>(((cp >> 12) & 0x3f) | 0x80);
- *(result++) = static_cast<uint8_t>(((cp >> 6) & 0x3f) | 0x80);
- *(result++) = static_cast<uint8_t>((cp & 0x3f) | 0x80);
- }
- return result;
+ return internal::append(cp, result);
}
template <typename octet_iterator, typename output_iterator>
@@ -148,7 +132,7 @@ namespace utf8
case internal::INVALID_LEAD :
case internal::INCOMPLETE_SEQUENCE :
case internal::OVERLONG_SEQUENCE :
- throw invalid_utf8(*it);
+ throw invalid_utf8(static_cast<uint8_t>(*it));
case internal::INVALID_CODE_POINT :
throw invalid_code_point(cp);
}
diff --git a/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/source/utf8/core.h b/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/source/utf8/core.h
index d237e77a07d..0eaf6a7d2af 100644
--- a/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/source/utf8/core.h
+++ b/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/source/utf8/core.h
@@ -297,6 +297,55 @@ namespace internal
return utf8::internal::validate_next(it, end, ignored);
}
+ // Internal implementation of both checked and unchecked append() function
+ // This function will be invoked by the overloads below, as they will know
+ // the octet_type.
+ template <typename octet_iterator, typename octet_type>
+ octet_iterator append(uint32_t cp, octet_iterator result) {
+ if (cp < 0x80) // one octet
+ *(result++) = static_cast<octet_type>(cp);
+ else if (cp < 0x800) { // two octets
+ *(result++) = static_cast<octet_type>((cp >> 6) | 0xc0);
+ *(result++) = static_cast<octet_type>((cp & 0x3f) | 0x80);
+ }
+ else if (cp < 0x10000) { // three octets
+ *(result++) = static_cast<octet_type>((cp >> 12) | 0xe0);
+ *(result++) = static_cast<octet_type>(((cp >> 6) & 0x3f) | 0x80);
+ *(result++) = static_cast<octet_type>((cp & 0x3f) | 0x80);
+ }
+ else { // four octets
+ *(result++) = static_cast<octet_type>((cp >> 18) | 0xf0);
+ *(result++) = static_cast<octet_type>(((cp >> 12) & 0x3f)| 0x80);
+ *(result++) = static_cast<octet_type>(((cp >> 6) & 0x3f) | 0x80);
+ *(result++) = static_cast<octet_type>((cp & 0x3f) | 0x80);
+ }
+ return result;
+ }
+
+ // One of the following overloads will be invoked from the API calls
+
+ // A simple (but dangerous) case: the caller appends byte(s) to a char array
+ inline char* append(uint32_t cp, char* result) {
+ return append<char*, char>(cp, result);
+ }
+
+ // Hopefully, most common case: the caller uses back_inserter
+ // i.e. append(cp, std::back_inserter(str));
+ template<typename container_type>
+ std::back_insert_iterator<container_type> append
+ (uint32_t cp, std::back_insert_iterator<container_type> result) {
+ return append<std::back_insert_iterator<container_type>,
+ typename container_type::value_type>(cp, result);
+ }
+
+ // The caller uses some other kind of output operator - not covered above
+ // Note that in this case we are not able to determine octet_type
+ // so we assume it's uint_8; that can cause a conversion warning if we are wrong.
+ template <typename octet_iterator>
+ octet_iterator append(uint32_t cp, octet_iterator result) {
+ return append<octet_iterator, uint8_t>(cp, result);
+ }
+
} // namespace internal
/// The library API - functions intended to be called by the users
diff --git a/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/source/utf8/cpp11.h b/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/source/utf8/cpp11.h
index 77771ff8e1a..2c9c9ba0bef 100644
--- a/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/source/utf8/cpp11.h
+++ b/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/source/utf8/cpp11.h
@@ -70,7 +70,7 @@ namespace utf8
inline std::size_t find_invalid(const std::string& s)
{
std::string::const_iterator invalid = find_invalid(s.begin(), s.end());
- return (invalid == s.end()) ? std::string::npos : (invalid - s.begin());
+ return (invalid == s.end()) ? std::string::npos : static_cast<std::size_t>(invalid - s.begin());
}
inline bool is_valid(const std::string& s)
diff --git a/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/source/utf8/cpp17.h b/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/source/utf8/cpp17.h
index 0205f127969..39b12b7c938 100644
--- a/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/source/utf8/cpp17.h
+++ b/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/source/utf8/cpp17.h
@@ -70,7 +70,7 @@ namespace utf8
inline std::size_t find_invalid(std::string_view s)
{
std::string_view::const_iterator invalid = find_invalid(s.begin(), s.end());
- return (invalid == s.end()) ? std::string_view::npos : (invalid - s.begin());
+ return (invalid == s.end()) ? std::string_view::npos : static_cast<std::size_t>(invalid - s.begin());
}
inline bool is_valid(std::string_view s)
diff --git a/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/source/utf8/unchecked.h b/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/source/utf8/unchecked.h
index 8bc34e8f655..7151a35b677 100644
--- a/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/source/utf8/unchecked.h
+++ b/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/source/utf8/unchecked.h
@@ -37,24 +37,7 @@ namespace utf8
template <typename octet_iterator>
octet_iterator append(uint32_t cp, octet_iterator result)
{
- if (cp < 0x80) // one octet
- *(result++) = static_cast<uint8_t>(cp);
- else if (cp < 0x800) { // two octets
- *(result++) = static_cast<uint8_t>((cp >> 6) | 0xc0);
- *(result++) = static_cast<uint8_t>((cp & 0x3f) | 0x80);
- }
- else if (cp < 0x10000) { // three octets
- *(result++) = static_cast<uint8_t>((cp >> 12) | 0xe0);
- *(result++) = static_cast<uint8_t>(((cp >> 6) & 0x3f) | 0x80);
- *(result++) = static_cast<uint8_t>((cp & 0x3f) | 0x80);
- }
- else { // four octets
- *(result++) = static_cast<uint8_t>((cp >> 18) | 0xf0);
- *(result++) = static_cast<uint8_t>(((cp >> 12) & 0x3f)| 0x80);
- *(result++) = static_cast<uint8_t>(((cp >> 6) & 0x3f) | 0x80);
- *(result++) = static_cast<uint8_t>((cp & 0x3f) | 0x80);
- }
- return result;
+ return internal::append(cp, result);
}
template <typename octet_iterator, typename output_iterator>
diff --git a/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/CMakeLists.txt b/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/CMakeLists.txt
index 4063df7c67e..f3ce2584c9d 100644
--- a/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/CMakeLists.txt
+++ b/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/CMakeLists.txt
@@ -1,17 +1,9 @@
add_executable(negative ${PROJECT_SOURCE_DIR}/tests/negative.cpp)
add_executable(cpp11 ${PROJECT_SOURCE_DIR}/tests/test_cpp11.cpp)
add_executable(cpp17 ${PROJECT_SOURCE_DIR}/tests/test_cpp17.cpp)
-add_executable(apitests
- ${PROJECT_SOURCE_DIR}/tests/test_checked_api.cpp
- ${PROJECT_SOURCE_DIR}/tests/test_unchecked_api.cpp
- ${PROJECT_SOURCE_DIR}/tests/test_checked_iterator.cpp
- ${PROJECT_SOURCE_DIR}/tests/test_unchecked_iterator.cpp
-)
-
-add_executable(noexceptionstests
- ${PROJECT_SOURCE_DIR}/tests/test_unchecked_api.cpp
- ${PROJECT_SOURCE_DIR}/tests/test_unchecked_iterator.cpp
-)
+add_executable(apitests ${PROJECT_SOURCE_DIR}/tests/apitests.cpp)
+
+add_executable(noexceptionstests ${PROJECT_SOURCE_DIR}/tests/noexceptionstests.cpp)
target_link_libraries(negative PRIVATE utf8::cpp)
target_link_libraries(cpp11 PRIVATE utf8::cpp)
@@ -19,6 +11,10 @@ target_link_libraries(cpp17 PRIVATE utf8::cpp)
target_link_libraries(apitests PRIVATE utf8::cpp)
target_link_libraries(noexceptionstests PRIVATE utf8::cpp)
+target_compile_options(${PROJECT_NAME} INTERFACE
+ $<$<CXX_COMPILER_ID:MSVC>:/W4>
+ $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wall -Wextra -Wpedantic -Wconversion>)
+
target_compile_options(noexceptionstests PUBLIC -fno-exceptions)
set_target_properties(negative apitests noexceptionstests
diff --git a/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/apitests.cpp b/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/apitests.cpp
new file mode 100644
index 00000000000..083266d7d27
--- /dev/null
+++ b/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/apitests.cpp
@@ -0,0 +1,6 @@
+#include "../extern/ftest/ftest.h"
+
+#include "test_checked_api.h"
+#include "test_checked_iterator.h"
+#include "test_unchecked_api.h"
+#include "test_unchecked_iterator.h"
diff --git a/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/noexceptionstests.cpp b/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/noexceptionstests.cpp
new file mode 100644
index 00000000000..108ee750cda
--- /dev/null
+++ b/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/noexceptionstests.cpp
@@ -0,0 +1,4 @@
+#include "../extern/ftest/ftest.h"
+
+#include "test_unchecked_api.h"
+#include "test_unchecked_iterator.h"
diff --git a/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/test_checked_api.cpp b/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/test_checked_api.h
index b57e1bc8942..3a7067b76a8 100644
--- a/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/test_checked_api.cpp
+++ b/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/test_checked_api.h
@@ -1,5 +1,6 @@
-#define F_TEST_NO_MAIN
-#include "../extern/ftest/ftest.h"
+#ifndef UTF8_FOR_CPP_TEST_CHECKED_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
+#define UTF8_FOR_CPP_TEST_CHECKED_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
+
#include "utf8.h"
#include <string>
@@ -38,13 +39,19 @@ TEST(CheckedAPITests, test_append)
EXPECT_EQ (u[2], 0x8d);
EXPECT_EQ (u[3], 0x86);
EXPECT_EQ (u[4], 0);
+
+ // Ensure no warnings with plain char
+ char c[2] = {0,0};
+ append('a', c);
+ EXPECT_EQ (c[0], 'a');
+ EXPECT_EQ (c[1], 0);
}
TEST(CheckedAPITests, test_next)
{
const char* twochars = "\xe6\x97\xa5\xd1\x88";
const char* w = twochars;
- int cp = next(w, twochars + 6);
+ unsigned int cp = next(w, twochars + 6);
EXPECT_EQ (cp, 0x65e5);
EXPECT_EQ (w, twochars + 3);
@@ -67,7 +74,7 @@ TEST(CheckedAPITests, test_next)
TEST(CheckedAPITests, test_peek_next)
{
const char* const cw = "\xe6\x97\xa5\xd1\x88";
- int cp = peek_next(cw, cw + 6);
+ unsigned int cp = peek_next(cw, cw + 6);
EXPECT_EQ (cp, 0x65e5);
}
@@ -75,7 +82,7 @@ TEST(CheckedAPITests, test_prior)
{
const char* twochars = "\xe6\x97\xa5\xd1\x88";
const char* w = twochars + 3;
- int cp = prior (w, twochars);
+ unsigned int cp = prior (w, twochars);
EXPECT_EQ (cp, 0x65e5);
EXPECT_EQ (w, twochars);
@@ -111,13 +118,13 @@ TEST(CheckedAPITests, test_advance)
TEST(CheckedAPITests, test_distance)
{
const char* twochars = "\xe6\x97\xa5\xd1\x88";
- size_t dist = utf8::distance(twochars, twochars + 5);
+ size_t dist = static_cast<size_t>(utf8::distance(twochars, twochars + 5));
EXPECT_EQ (dist, 2);
}
TEST(CheckedAPITests, test_utf32to8)
{
- int utf32string[] = {0x448, 0x65E5, 0x10346, 0};
+ unsigned int utf32string[] = {0x448, 0x65E5, 0x10346, 0};
string utf8result;
utf32to8(utf32string, utf32string + 3, back_inserter(utf8result));
EXPECT_EQ (utf8result.size(), 9);
@@ -126,7 +133,7 @@ TEST(CheckedAPITests, test_utf32to8)
TEST(CheckedAPITests, test_utf8to32)
{
const char* twochars = "\xe6\x97\xa5\xd1\x88";
- vector<int> utf32result;
+ vector<unsigned int> utf32result;
utf8to32(twochars, twochars + 5, back_inserter(utf32result));
EXPECT_EQ (utf32result.size(), 2);
}
@@ -187,3 +194,5 @@ TEST(CheckedAPITests, test_starts_with_bom)
bool no_bbom = starts_with_bom(threechars, threechars + sizeof(threechars));
EXPECT_FALSE (no_bbom);
}
+
+#endif
diff --git a/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/test_checked_iterator.cpp b/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/test_checked_iterator.h
index 3f9bfe96a2f..2829a734edf 100644
--- a/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/test_checked_iterator.cpp
+++ b/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/test_checked_iterator.h
@@ -1,5 +1,6 @@
-#define F_TEST_NO_MAIN
-#include "../extern/ftest/ftest.h"
+#ifndef UTF8_FOR_CPP_TEST_CHECKED_ITERATOR_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
+#define UTF8_FOR_CPP_TEST_CHECKED_ITERATOR_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
+
#include "utf8.h"
using namespace utf8;
@@ -30,3 +31,5 @@ TEST(CheckedIteratrTests, test_decrement)
EXPECT_EQ (--it, utf8::iterator<const char*>(threechars, threechars, threechars + 9));
EXPECT_EQ (*it, 0x10346);
}
+
+#endif
diff --git a/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/test_unchecked_api.cpp b/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/test_unchecked_api.h
index c400ada0d2b..10c5991ede7 100644
--- a/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/test_unchecked_api.cpp
+++ b/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/test_unchecked_api.h
@@ -1,36 +1,38 @@
-#include "../extern/ftest/ftest.h"
+#ifndef UTF8_FOR_CPP_TEST_UNCHECKED_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
+#define UTF8_FOR_CPP_TEST_UNCHECKED_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
+
#include "utf8/unchecked.h"
#include <string>
#include <vector>
-using namespace utf8::unchecked;
+
using namespace std;
TEST(UnCheckedAPITests, test_append)
{
unsigned char u[5] = {0,0,0,0,0};
- append(0x0448, u);
+ utf8::unchecked::append(0x0448, u);
EXPECT_EQ (u[0], 0xd1);
EXPECT_EQ (u[1], 0x88);
EXPECT_EQ (u[2], 0);
EXPECT_EQ (u[3], 0);
EXPECT_EQ (u[4], 0);
- append(0x65e5, u);
+ utf8::unchecked::append(0x65e5, u);
EXPECT_EQ (u[0], 0xe6);
EXPECT_EQ (u[1], 0x97);
EXPECT_EQ (u[2], 0xa5);
EXPECT_EQ (u[3], 0);
EXPECT_EQ (u[4], 0);
- append(0x3044, u);
+ utf8::unchecked::append(0x3044, u);
EXPECT_EQ (u[0], 0xe3);
EXPECT_EQ (u[1], 0x81);
EXPECT_EQ (u[2], 0x84);
EXPECT_EQ (u[3], 0);
EXPECT_EQ (u[4], 0);
- append(0x10346, u);
+ utf8::unchecked::append(0x10346, u);
EXPECT_EQ (u[0], 0xf0);
EXPECT_EQ (u[1], 0x90);
EXPECT_EQ (u[2], 0x8d);
@@ -42,7 +44,7 @@ TEST(UnCheckedAPITests, test_next)
{
const char* twochars = "\xe6\x97\xa5\xd1\x88";
const char* w = twochars;
- int cp = utf8::unchecked::next(w);
+ unsigned int cp = utf8::unchecked::next(w);
EXPECT_EQ (cp, 0x65e5);
EXPECT_EQ (w, twochars + 3);
@@ -65,7 +67,7 @@ TEST(UnCheckedAPITests, test_next)
TEST(UnCheckedAPITests, test_peek_next)
{
const char* const cw = "\xe6\x97\xa5\xd1\x88";
- int cp = peek_next(cw);
+ unsigned int cp = utf8::unchecked::peek_next(cw);
EXPECT_EQ (cp, 0x65e5);
}
@@ -73,19 +75,19 @@ TEST(UnCheckedAPITests, test_prior)
{
const char* twochars = "\xe6\x97\xa5\xd1\x88";
const char* w = twochars + 3;
- int cp = prior (w);
+ unsigned int cp = utf8::unchecked::prior (w);
EXPECT_EQ (cp, 0x65e5);
EXPECT_EQ (w, twochars);
const char* threechars = "\xf0\x90\x8d\x86\xe6\x97\xa5\xd1\x88";
w = threechars + 9;
- cp = prior(w);
+ cp = utf8::unchecked::prior(w);
EXPECT_EQ (cp, 0x0448);
EXPECT_EQ (w, threechars + 7);
- cp = prior(w);
+ cp = utf8::unchecked::prior(w);
EXPECT_EQ (cp, 0x65e5);
EXPECT_EQ (w, threechars + 4);
- cp = prior(w);
+ cp = utf8::unchecked::prior(w);
EXPECT_EQ (cp, 0x10346);
EXPECT_EQ (w, threechars);
}
@@ -109,23 +111,23 @@ TEST(UnCheckedAPITests, test_advance)
TEST(UnCheckedAPITests, test_distance)
{
const char* twochars = "\xe6\x97\xa5\xd1\x88";
- size_t dist = utf8::unchecked::distance(twochars, twochars + 5);
+ size_t dist = static_cast<size_t>(utf8::unchecked::distance(twochars, twochars + 5));
EXPECT_EQ (dist, 2);
}
TEST(UnCheckedAPITests, test_utf32to8)
{
- int utf32string[] = {0x448, 0x65E5, 0x10346, 0};
+ unsigned int utf32string[] = {0x448, 0x65E5, 0x10346, 0};
string utf8result;
- utf32to8(utf32string, utf32string + 3, back_inserter(utf8result));
+ utf8::unchecked::utf32to8(utf32string, utf32string + 3, back_inserter(utf8result));
EXPECT_EQ (utf8result.size(), 9);
}
TEST(UnCheckedAPITests, test_utf8to32)
{
const char* twochars = "\xe6\x97\xa5\xd1\x88";
- vector<int> utf32result;
- utf8to32(twochars, twochars + 5, back_inserter(utf32result));
+ vector<unsigned int> utf32result;
+ utf8::unchecked::utf8to32(twochars, twochars + 5, back_inserter(utf32result));
EXPECT_EQ (utf32result.size(), 2);
}
@@ -133,7 +135,7 @@ TEST(UnCheckedAPITests, test_utf16to8)
{
unsigned short utf16string[] = {0x41, 0x0448, 0x65e5, 0xd834, 0xdd1e};
string utf8result;
- utf16to8(utf16string, utf16string + 5, back_inserter(utf8result));
+ utf8::unchecked::utf16to8(utf16string, utf16string + 5, back_inserter(utf8result));
EXPECT_EQ (utf8result.size(), 10);
}
@@ -141,7 +143,7 @@ TEST(UnCheckedAPITests, test_utf8to16)
{
char utf8_with_surrogates[] = "\xe6\x97\xa5\xd1\x88\xf0\x9d\x84\x9e";
vector <unsigned short> utf16result;
- utf8to16(utf8_with_surrogates, utf8_with_surrogates + 9, back_inserter(utf16result));
+ utf8::unchecked::utf8to16(utf8_with_surrogates, utf8_with_surrogates + 9, back_inserter(utf16result));
EXPECT_EQ (utf16result.size(), 4);
EXPECT_EQ (utf16result[2], 0xd834);
EXPECT_EQ (utf16result[3], 0xdd1e);
@@ -151,7 +153,7 @@ TEST(UnCheckedAPITests, test_replace_invalid)
{
char invalid_sequence[] = "a\x80\xe0\xa0\xc0\xaf\xed\xa0\x80z";
vector<char> replace_invalid_result;
- replace_invalid (invalid_sequence, invalid_sequence + sizeof(invalid_sequence), std::back_inserter(replace_invalid_result), '?');
+ utf8::unchecked::replace_invalid (invalid_sequence, invalid_sequence + sizeof(invalid_sequence), std::back_inserter(replace_invalid_result), '?');
bool bvalid = utf8::is_valid(replace_invalid_result.begin(), replace_invalid_result.end());
EXPECT_TRUE (bvalid);
const char fixed_invalid_sequence[] = "a????z";
@@ -159,3 +161,4 @@ TEST(UnCheckedAPITests, test_replace_invalid)
EXPECT_TRUE (std::equal(replace_invalid_result.begin(), replace_invalid_result.begin() + sizeof(fixed_invalid_sequence), fixed_invalid_sequence));
}
+#endif
diff --git a/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/test_unchecked_iterator.cpp b/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/test_unchecked_iterator.h
index 68943bf94cc..4294232d6a5 100644
--- a/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/test_unchecked_iterator.cpp
+++ b/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/tests/test_unchecked_iterator.h
@@ -1,5 +1,5 @@
-#define F_TEST_NO_MAIN
-#include "../extern/ftest/ftest.h"
+#ifndef UTF8_FOR_CPP_TEST_UNCHECKED_ITERATOR_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
+#define UTF8_FOR_CPP_TEST_UNCHECKED_ITERATOR_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
#include "utf8/unchecked.h"
@@ -32,3 +32,5 @@ TEST(UnCheckedIteratrTests, test_decrement)
EXPECT_EQ (*it, 0x10346);
}
+
+#endif
diff --git a/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/utf8cppConfig.cmake.in b/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/utf8cppConfig.cmake.in
new file mode 100644
index 00000000000..450fe8d186c
--- /dev/null
+++ b/Build/source/utils/asymptote/LspCpp/third_party/utfcpp/utf8cppConfig.cmake.in
@@ -0,0 +1,6 @@
+@PACKAGE_INIT@
+
+include("${CMAKE_CURRENT_LIST_DIR}/utf8cppTargets.cmake")
+check_required_components( "utf8cpp" )
+
+add_library(utf8::cpp ALIAS utf8cpp)
diff --git a/Build/source/utils/asymptote/Makefile.in b/Build/source/utils/asymptote/Makefile.in
index 4d1ea7b99e3..15b2a7c6bb6 100644
--- a/Build/source/utils/asymptote/Makefile.in
+++ b/Build/source/utils/asymptote/Makefile.in
@@ -13,7 +13,7 @@ GCPPLIB = @GCPPLIB@
GCLIBS = $(GCPPLIB) $(GCLIB)
LFLAGS = @LDFLAGS@ -LLspCpp -LLspCpp/third_party/uri/src
LIBS = $(LFLAGS) @PTHREAD_LIBS@ @GLEW@ @LIBS@ $(GCLIBS) @LSPLIBS@
-DOSLIBS = $(subst -lncurses, -ltermcap, $(LIBS)) -lwolfssl -lgdi32 -lwinmm -s -static
+DOSLIBS = $(LIBS) -ltermcap -lwolfssl -lgdi32 -lwinmm -s -static
CMAKE ?= cmake
PERL ?= perl
@@ -249,7 +249,7 @@ asy-keywords.el: asy
@echo Creating $@;
$(ASY) -l > asy.list
ls $(addsuffix /*.asy,$(KEYWORDS)) | grep -v plain\* | \
- grep -v three_\* | grep -v featpost3D | xargs $(ASY) -l >> asy.list
+ grep -v three_\* | grep -v map | xargs $(ASY) -l >> asy.list
$(PERL) ./asy-list.pl asy.list $(revision)
install-notexhash: asy-keywords.el install-asy install-man
diff --git a/Build/source/utils/asymptote/ReleaseNotes b/Build/source/utils/asymptote/ReleaseNotes
index d5a628df204..fe6916b08b6 100644
--- a/Build/source/utils/asymptote/ReleaseNotes
+++ b/Build/source/utils/asymptote/ReleaseNotes
@@ -1,6 +1,33 @@
+Release Notes for Version 2.87
+
+Templated imports were implemented.
+An incorrect dvisvgm optimization is avoided.
+SVG gradient shading offsets were fixed.
+Integer are now implicitly formatted with full precision.
+Inferred assignment of void type is prohibited.
+An LSP segmentation fault was fixed.
+Repeated stripping of file extensions is avoided.
+The --output-directory option of latexmk is supported.
+The OSMesa compatibility profile is used for offscreen rendering.
+The fitscreen toggle is fixed.
+The context menu in Xasy is now only opened for GUI-drawn items.
+A -v3d option allows embedding V3D content within a PDF file.
+A workaround was implemented for a MacOS libc++ parsing bug.
+The documentation was updated.
+
+Release Notes for Version 2.86
+
+PDF transfer functions are automatically applied;
+EPS output suppresses .setblendmode.
+NaN and inf values can be read in cvs mode.
+The OpenGL index buffer is properly initialized.
+WebGL and V3D primitives are used only when unscaled.
+Bugs in the inversion section of the geometry module were fixed.
+Portability issues were addressed.
+
Release Notes for Version 2.85
-Intersections of 3D paths with Bezier triangles was implemented.
+Intersections of 3D paths with Bezier triangles were implemented.
A workaround for broken offscreen graphics drivers was implemented.
The icon resource file is now pregenerated. Uninitialized variables and
a division by zero were fixed. The 3D animation timer and keyboard controls
diff --git a/Build/source/utils/asymptote/asy-keywords.el b/Build/source/utils/asymptote/asy-keywords.el
index 6bae43d06b5..c78bc2f122b 100644
--- a/Build/source/utils/asymptote/asy-keywords.el
+++ b/Build/source/utils/asymptote/asy-keywords.el
@@ -2,7 +2,7 @@
;; This file is automatically generated by asy-list.pl.
;; Changes will be overwritten.
;;
-(defvar asy-keywords-version "2.85")
+(defvar asy-keywords-version "2.87")
(defvar asy-keyword-name '(
and controls tension atleast curl if else while for do return break continue struct typedef new access import unravel from include quote static public private restricted this explicit true false null cycle newframe operator ))
@@ -11,7 +11,7 @@ and controls tension atleast curl if else while for do return break continue str
Braid FitResult Label Legend Solution TreeNode abscissa arc arrowhead binarytree binarytreeNode block bool bool3 bounds bqe circle conic coord coordsys cputime ellipse evaluatedpoint file filltype frame grid3 guide horner hsv hyperbola int inversion key light line linefit marginT marker mass node object pair parabola patch path path3 pen picture point position positionedvector projection rational real realschur revolution scaleT schur scientific segment side simplex slice solution splitface string surface tensionSpecifier ticklocate ticksgridT tickvalues transform transformation tree triangle trilinear triple vector vertex void ))
(defvar asy-function-name '(
-AND Align Arc ArcArrow ArcArrows Arrow Arrows AtA Automatic AvantGarde B03 B13 B23 B33 BBox BWRainbow BWRainbow2 Bar Bars BeginArcArrow BeginArrow BeginBar BeginDotMargin BeginMargin BeginPenMargin Blank Bookman Bottom BottomTop Bounds Break Broken BrokenLog CLZ CTZ Ceil Circle CircleBarIntervalMarker Cos Courier CrossIntervalMarker DOSendl DOSnewl DefaultFormat DefaultLogFormat Degrees Dir DotMargin DotMargins Dotted Draw Drawline Embed EndArcArrow EndArrow EndBar EndDotMargin EndMargin EndPenMargin Fill FillDraw Finite Floor Format Full Gaussian Gaussrand Gaussrandpair Gradient Grayscale Helvetica Hermite HookHead InOutTicks InTicks Jn Label Landscape Left LeftRight LeftTicks Legend Linear Log LogFormat Margin Margins Mark MidArcArrow MidArrow NOT NewCenturySchoolBook NoBox NoMargin NoModifier NoTicks NoTicks3 NoZero NoZeroFormat None OR OmitFormat OmitTick OmitTickInterval OmitTickIntervals OutTicks Ox Oy Palatino PaletteTicks Pen PenMargin PenMargins Pentype Portrait RGB RadialShade RadialShadeDraw Rainbow Range Relative Right RightTicks Rotate Round SQR Scale ScaleX ScaleY ScaleZ Seascape Shift Sin Slant Spline StickIntervalMarker Straight Symbol Tan TeXify Ticks Ticks3 TildeIntervalMarker TimesRoman Top TrueMargin UnFill UpsideDown Wheel X XEquals XOR XY XYEquals XYZero XYgrid XZEquals XZZero XZero XZgrid Y YEquals YXgrid YZ YZEquals YZZero YZero YZgrid Yn Z ZX ZXgrid ZYgrid ZapfChancery ZapfDingbats _begingroup3 _cputime _draw _eval _findroot _image _labelpath _projection _schur _shipout _strokepath _texpath aCos aSin aTan abort abs abs2 accel acos acosh acot acsc activatequote add addArrow addMargins addSaveFunction addpenarc addpenline addseg adjust alias align all altitude angabscissa angle angledegrees angpoint animate annotate anticomplementary antipedal apply approximate arc arcarrowsize arccircle arcdir arcfromcenter arcfromfocus arclength arcnodesnumber arcpoint arcsubtended arcsubtendedcenter arctime arctopath array arrow arrow2 arrowbase arrowbasepoints arrowsize ascii asec asin asinh ask assert asy asycode asydir asyfigure asyfilecode asyinclude asywrite atan atan2 atanh atbreakpoint atexit attach attract atupdate autoformat autoscale autoscale3 axes axes3 axialshade axis axiscoverage azimuth babel background bangles bar barmarksize barsize basealign baseline bbox beep begin beginclip begingroup beginpoint between bevel bezier bezierP bezierPP bezierPPP bezulate bibliography bibliographystyle binarytree binarytreeNode binomial bins bisector bisectorpoint bispline bispline0 bitreverse blend blockconnector box bqe brace breakpoint breakpoints brick buildRestoreDefaults buildRestoreThunk buildcycle bulletcolor byte byteinv calculateScaling canonical canonicalcartesiansystem cartesiansystem case1 case2 case3 cbrt cd ceil center centerToFocus centroid cevian change2 changecoordsys checkSegment check_fpt_zero checkconditionlength checker checkincreasing checklengths checkposition checkpt checkptincube checktriangle choose circle circlebarframe circlemarkradius circlenodesnumber circumcenter circumcircle clamped clear clip clipdraw close cmyk code colatitude collect collinear color colorless colors colorspace comma compassmark complement complementary concat concurrent cone conic conicnodesnumber conictype conj connect containmentTree contains contour contour3 controlSpecifier convert coordinates coordsys copy copyPairOrTriple cos cosh cot countIntersections cputime crop cropcode cross crossframe crosshatch crossmarksize csc cubicroots curabscissa curlSpecifier curpoint currentarrow currentexitfunction currentmomarrow currentpolarconicroutine curve cut cutafter cutbefore cyclic cylinder deactivatequote debugger deconstruct defaultdir defaultformat defaultpen defined degenerate degrees delete deletepreamble determinant diagonal diamond diffdiv dir dirSpecifier dirtime display distance divisors do_overpaint dot dotframe dotsize downcase draw drawAll drawCylinder drawDisk drawDoubleLine drawFermion drawGhost drawGluon drawMomArrow drawPhoton drawScalar drawSphere drawTube drawVertex drawVertexBox drawVertexBoxO drawVertexBoxX drawVertexO drawVertexOX drawVertexTriangle drawVertexTriangleO drawVertexX drawarrow drawarrow2 drawbeziertriangle drawline drawpixel drawstrokepath drawtick duplicate elle ellipse ellipsenodesnumber embed embed3 embedplayer empty enclose end endclip endgroup endgroup3 endl endpoint endpoints eof eol equation equations erase erasestep erf erfc error errorbar errorbars eval excenter excircle exit exitfunction exp expfactors expi expm1 exradius extend extension extouch fabs factorial fermat fft fhorner figure file filecode fill filldraw filloutside fillrule filltype find findall findroot finite finiteDifferenceJacobian firstcut firstframe fit fit2 fixedscaling floor flush fmdefaults fmod focusToCenter font fontcommand fontsize foot format frac frequency fromCenter fromFocus fspline functionshade gamma gcd generate_random_backtrace generateticks gergonne getc getint getpair getreal getstring gettriple gluon gouraudshade graph graphic graphicscale graphwithderiv gray grestore grid grid3 gsave halfbox hatch hdiffdiv hermite hex histogram history hline hprojection hsv hyperbola hyperbolanodesnumber hyperlink hypot identity image implicitsurface importv3d incenter incentral incircle increasing incrementposition indexedfigure initdefaults initialized input inradius insert inside insphere integrate interactive interior interp interpolate intersect intersection intersectionpoint intersectionpoints intersections intouch inverse inversion invisible is3D isDuplicate isnan isogonal isogonalconjugate isometry isotomic isotomicconjugate isparabola italic item jobname key kurtosis kurtosisexcess label labelaxis labelmargin labelpath labels labeltick labelx labelx3 labely labely3 labelz labelz3 lastcut latex latitude latticeshade layer layout lcm ldexp leastsquares legend legenditem length lexorder lift light limits line linear linecap lineinversion linejoin linemargin lineskip linetype linewidth link list lm_enorm lm_evaluate_default lm_lmdif lm_lmpar lm_minimize lm_print_default lm_print_quiet lm_qrfac lm_qrsolv locale locate locatefile location log log10 log1p logaxiscoverage longitude lookup make3dgrid makeMappingArray makeNode makecircle makedraw makepen maketriangle map mapArray mapTemplate margin markangle markangleradius markanglespace markarc marker markinterval marknodes markrightangle markthin markuniform mass masscenter massformat math max max3 maxAfterTransform maxbezier maxbound maxcoords maxlength maxratio maxtimes mean medial median midpoint min min3 minAfterTransform minbezier minbound minipage minratio mintimes miterlimit mktemp momArrowPath momarrowsize monotonic multifigure nGrad nativeformat natural newl newpage newslide newton newtree nextframe nextnormal nextpage nib nodabscissa node none norm normalout normalvideo notaknot nowarn numberpage nurb object offset onpath opacity opposite orient orientation origin orthic orthocenter orthocentercenter outdirectory outformat outline outname outprefix output overloadedMessage overwrite pack pad pairs palette parabola parabolanodesnumber parallel parallelogram partialsum patchwithnormals path path3 pathbetween pathinface pattern pause pdf pedal periodic perp perpendicular perpendicularmark phantom phi1 phi2 phi3 phi4 photon piecewisestraight point polar polarconicroutine polargraph polygon popcount postcontrol postscript pow10 ppoint prc prc0 prconly precision precontrol prepend primitive printBytecode print_random_addresses progress project projection projecttospan projecttospan_findcoeffs purge pwhermite quadpatches quadrant quadraticroots quantize quarticroots quotient radialshade radians radicalcenter radicalline radius rand randompath rationalidentity rd readline realmult realquarticroots rectangle rectangular rectify reflect relabscissa relative relativedistance reldir relpoint reltime remainder remark removeDuplicates rename render replace report resetdefaultpen restore restoredefaults reverse reversevideo rf rfind rgb rgba rgbint rms rotate rotateO rotation round roundbox roundedpath roundrectangle samecoordsys sameside sample save savedefaults saveline scale scale3 scaleO scaleT scaleless schur scientific search searchtree sec secondaryX secondaryY seconds section sector seek seekeof segment segmentlimits sequence setpens sgn sgnd sharpangle sharpdegrees shift shiftless shipout shipout3 show simeq simplex simplexInit simplexPhase1 simplexPhase2 simplexTableau simplexWrite simpson sin sinh size size3 skewness skip slant sleep slice slope slopefield solve solveBVP sort sourceline sphere split sqrt square srand standardizecoordsys stdev step stickframe stickmarksize stickmarkspace stop straight straightness string stripdirectory stripextension stripfile stripsuffix strokepath subdivide subitem subpath substr sum surface symmedial symmedian system tab tableau tan tangent tangential tangents tanh tell tensionSpecifier tensorshade tex texcolor texify texpath texpreamble texreset texshipout texsize texstring textpath thick thin tick tickMax tickMax3 tickMin tickMin3 ticklabelshift ticklocate tildeframe tildemarksize tile tiling time times title titlepage topbox transform transformation transpose trembleFuzz triangle triangleAbc triangleabc triangletoquads trianglewithnormals triangulate tricoef tridiagonal trilinear trim truepoint tube type uncycle unfill uniform unique unit unitrand unitsize unityroot unstraighten upcase updatefunction uperiodic upscale uptodate usepackage usersetting usetypescript usleep value variance variancebiased vbox vector vectorfield verbatim view vline vperiodic vprojection warn warning windingnumber write xasyKEY xaxis xaxis3 xaxis3At xaxisAt xequals xlimits xmap xpart xscale xscaleO xtick xtick3 xtrans yaxis yaxis3 yaxis3At yaxisAt yequals ylimits ypart yscale yscaleO ytick ytick3 ytrans zaxis3 zaxis3At zero zlimits zpart ztick ztick3 ztrans ))
+AND Align Arc ArcArrow ArcArrows Arrow Arrows AtA Automatic AvantGarde B03 B13 B23 B33 BBox BWRainbow BWRainbow2 Bar Bars BeginArcArrow BeginArrow BeginBar BeginDotMargin BeginMargin BeginPenMargin Blank Bookman Bottom BottomTop Bounds Break Broken BrokenLog CLZ CTZ Ceil Circle CircleBarIntervalMarker Cos Courier CrossIntervalMarker DOSendl DOSnewl DefaultFormat DefaultLogFormat Degrees Dir DotMargin DotMargins Dotted Draw Drawline Embed EndArcArrow EndArrow EndBar EndDotMargin EndMargin EndPenMargin Fill FillDraw Finite Floor Format Full Gaussian Gaussrand Gaussrandpair Gradient Grayscale Helvetica Hermite HookHead InOutTicks InTicks Jn Label Landscape Left LeftRight LeftTicks Legend Linear Log LogFormat Margin Margins Mark MidArcArrow MidArrow NOT NewCenturySchoolBook NoBox NoMargin NoModifier NoTicks NoTicks3 NoZero NoZeroFormat None OR OmitFormat OmitTick OmitTickInterval OmitTickIntervals OutTicks Ox Oy Palatino PaletteTicks Pen PenMargin PenMargins Pentype Portrait RGB RadialShade RadialShadeDraw Rainbow Range Relative Right RightTicks Rotate Round SQR Scale ScaleX ScaleY ScaleZ Seascape Shift Sin Slant Spline StickIntervalMarker Straight Symbol Tan TeXify Ticks Ticks3 TildeIntervalMarker TimesRoman Top TrueMargin UnFill UpsideDown Wheel X XEquals XOR XY XYEquals XYZero XYgrid XZEquals XZZero XZero XZgrid Y YEquals YXgrid YZ YZEquals YZZero YZero YZgrid Yn Z ZX ZXgrid ZYgrid ZapfChancery ZapfDingbats _begingroup3 _cputime _draw _eval _findroot _image _labelpath _projection _schur _shipout _strokepath _texpath aCos aSin aTan abort abs abs2 accel acos acosh acot acsc activatequote add addArrow addMargins addSaveFunction addpenarc addpenline addseg adjust alias align all altitude angabscissa angle angledegrees angpoint animate annotate anticomplementary antipedal apply approximate arc arcarrowsize arccircle arcdir arcfromcenter arcfromfocus arclength arcnodesnumber arcpoint arcsubtended arcsubtendedcenter arctime arctopath array arrow arrow2 arrowbase arrowbasepoints arrowsize ascii asec asin asinh ask assert asy asycode asydir asyfigure asyfilecode asyinclude asywrite atan atan2 atanh atbreakpoint atexit attach attract atupdate autoformat autoscale autoscale3 axes axes3 axialshade axis axiscoverage azimuth babel background bangles bar barmarksize barsize basealign baseline bbox beep begin beginclip begingroup beginpoint between bevel bezier bezierP bezierPP bezierPPP bezulate bibliography bibliographystyle binarytree binarytreeNode binomial bins bisector bisectorpoint bispline bispline0 bitreverse blend blockconnector box bqe brace breakpoint breakpoints brick buildRestoreDefaults buildRestoreThunk buildcycle bulletcolor byte byteinv calculateScaling canonical canonicalcartesiansystem cartesiansystem case1 case2 case3 cbrt cd ceil center centerToFocus centroid cevian change2 changecoordsys checkSegment check_fpt_zero checkconditionlength checker checkincreasing checklengths checkposition checkpt checkptincube checktriangle choose circle circlebarframe circlemarkradius circlenodesnumber circumcenter circumcircle clamped clear clip clipdraw close cmyk code colatitude collect collinear color colorless colors colorspace comma compassmark complement complementary concat concurrent cone conic conicnodesnumber conictype conj connect containmentTree contains contour contour3 controlSpecifier convert coordinates coordsys copy copyPairOrTriple cos cosh cot countIntersections cputime crop cropcode cross crossframe crosshatch crossmarksize csc cubicroots curabscissa curlSpecifier curpoint currentarrow currentexitfunction currentmomarrow currentpolarconicroutine curve cut cutafter cutbefore cyclic cylinder deactivatequote debugger deconstruct defaultdir defaultformat defaultpen defined degenerate degrees delete deletepreamble determinant diagonal diamond diffdiv dir dirSpecifier dirtime display distance divisors do_overpaint dot dotframe dotsize downcase draw drawAll drawCylinder drawDisk drawDoubleLine drawFermion drawGhost drawGluon drawMomArrow drawPhoton drawScalar drawSphere drawTube drawVertex drawVertexBox drawVertexBoxO drawVertexBoxX drawVertexO drawVertexOX drawVertexTriangle drawVertexTriangleO drawVertexX drawarrow drawarrow2 drawbeziertriangle drawline drawpixel drawstrokepath drawtick duplicate elle ellipse ellipsenodesnumber embed embed3 embedplayer empty enclose end endclip endgroup endgroup3 endl endpoint endpoints eof eol equation equations erase erasestep erf erfc error errorbar errorbars eval excenter excircle exit exitfunction exp expfactors expi expm1 exradius extend extension extouch fabs factorial fermat fft fhorner figure file filecode fill filldraw filloutside fillrule filltype find findall findroot finite finiteDifferenceJacobian firstcut firstframe fit fit2 fixedscaling floor flush fmdefaults fmod focusToCenter font fontcommand fontsize foot format frac frequency fromCenter fromFocus fspline functionshade gamma gcd generate_random_backtrace generateticks gergonne getc getint getpair getreal getstring gettriple gluon gouraudshade graph graphic graphicscale graphwithderiv gray grestore grid grid3 gsave halfbox hatch hdiffdiv hermite hex histogram history hline hprojection hsv hyperbola hyperbolanodesnumber hyperlink hypot identity image implicitsurface importv3d incenter incentral incircle increasing incrementposition indexedfigure initdefaults initialized input inradius insert inside insphere integrate interactive interior interp interpolate intersect intersection intersectionpoint intersectionpoints intersections intouch inverse inversion invisible is3D isDuplicate isnan isogonal isogonalconjugate isometry isotomic isotomicconjugate isparabola italic item jobname key kurtosis kurtosisexcess label labelaxis labelmargin labelpath labels labeltick labelx labelx3 labely labely3 labelz labelz3 lastcut latex latitude latticeshade layer layout lcm ldexp leastsquares legend legenditem length lexorder lift light limits line linear linecap lineinversion linejoin linemargin lineskip linetype linewidth link list lm_enorm lm_evaluate_default lm_lmdif lm_lmpar lm_minimize lm_print_default lm_print_quiet lm_qrfac lm_qrsolv locale locate locatefile location log log10 log1p logaxiscoverage longitude lookup make3dgrid makeNode makecircle makedraw makepen maketriangle map mapArray mapArrayString margin markangle markangleradius markanglespace markarc marker markinterval marknodes markrightangle markthin markuniform mass masscenter massformat math max max3 maxAfterTransform maxbezier maxbound maxcoords maxlength maxratio maxtimes mean medial median midpoint min min3 minAfterTransform minbezier minbound minipage minratio mintimes miterlimit mktemp momArrowPath momarrowsize monotonic multifigure nGrad nativeformat natural newl newpage newslide newton newtree nextframe nextnormal nextpage nib nodabscissa node none norm normalout normalvideo notaknot nowarn numberpage nurb object offset onpath opacity opposite orient orientation origin orthic orthocenter orthocentercenter outdirectory outformat outline outname outprefix output overloadedMessage overwrite pack pad pairs palette parabola parabolanodesnumber parallel parallelogram partialsum patchwithnormals path path3 pathbetween pathinface pattern pause pdf pedal periodic perp perpendicular perpendicularmark phantom phi1 phi2 phi3 phi4 photon piecewisestraight point polar polarconicroutine polargraph polygon popcount postcontrol postscript pow10 ppoint prc prc0 prconly precision precontrol prepend primitive printBytecode print_random_addresses progress project projection projecttospan projecttospan_findcoeffs purge pwhermite quadpatches quadrant quadraticroots quantize quarticroots quotient radialshade radians radicalcenter radicalline radius rand randompath rationalidentity rd readline realmult realquarticroots rectangle rectangular rectify reflect relabscissa relative relativedistance reldir relpoint reltime remainder remark removeDuplicates rename render replace report resetdefaultpen restore restoredefaults reverse reversevideo rf rfind rgb rgba rgbint rms rotate rotateO rotation round roundbox roundedpath roundrectangle samecoordsys sameside sample save savedefaults saveline scale scale3 scaleO scaleT scaleless schur scientific search searchtree sec secondaryX secondaryY seconds section sector seek seekeof segment segmentlimits sequence setpens sgn sgnd sharpangle sharpdegrees shift shiftless shipout shipout3 show simeq simplex simplexInit simplexPhase1 simplexPhase2 simplexTableau simplexWrite simpson sin sinh size size3 skewness skip slant sleep slice slope slopefield solve solveBVP sort sourceline sphere split sqrt square srand standardizecoordsys stdev step stickframe stickmarksize stickmarkspace stop straight straightness string stripdirectory stripextension stripfile stripsuffix strokepath subdivide subitem subpath substr sum surface symmedial symmedian system tab tableau tan tangent tangential tangents tanh tell tensionSpecifier tensorshade tex texcolor texify texpath texpreamble texreset texshipout texsize texstring textpath thick thin tick tickMax tickMax3 tickMin tickMin3 ticklabelshift ticklocate tildeframe tildemarksize tile tiling time times title titlepage topbox transform transformation transpose trembleFuzz triangle triangleAbc triangleabc triangletoquads trianglewithnormals triangulate tricoef tridiagonal trilinear trim truepoint tube uncycle unfill uniform unique unit unitrand unitsize unityroot unstraighten upcase updatefunction uperiodic upscale uptodate usepackage usersetting usetypescript usleep value variance variancebiased vbox vector vectorfield verbatim view vline vperiodic vprojection warn warning windingnumber write xasyKEY xaxis xaxis3 xaxis3At xaxisAt xequals xlimits xmap xpart xscale xscaleO xtick xtick3 xtrans yaxis yaxis3 yaxis3At yaxisAt yequals ylimits ypart yscale yscaleO ytick ytick3 ytrans zaxis3 zaxis3At zero zlimits zpart ztick ztick3 ztrans ))
(defvar asy-variable-name '(
-Accent AliceBlue Align Allow AntiqueWhite Apricot Aqua Aquamarine Aspect Azure BeginPoint Beige Bisque Bittersweet Black BlanchedAlmond Blue BlueGreen BlueViolet Blues Both BrBG Break BrickRed Brown BuGn BuPu BurlyWood BurntOrange CCW CMRmap CW CadetBlue CarnationPink Center Centered Cerulean Chartreuse Chocolate Coeff Coral CornflowerBlue Cornsilk Crimson Crop Cyan Dandelion Dark2 DarkBlue DarkCyan DarkGoldenrod DarkGray DarkGreen DarkKhaki DarkMagenta DarkOliveGreen DarkOrange DarkOrchid DarkRed DarkSalmon DarkSeaGreen DarkSlateBlue DarkSlateGray DarkTurquoise DarkViolet DeepPink DeepSkyBlue DefaultHead DimGray DodgerBlue Dotted Down Draw E ENE EPS ESE E_Euler E_PC E_RK2 E_RK3BS Emerald EndPoint Euler Fill FillDraw FireBrick FloralWhite ForestGreen Fuchsia Gainsboro GhostWhite GnBu Gold Goldenrod Gray Green GreenYellow Greens Greys Honeydew HookHead Horizontal HotPink I IgnoreAspect IndianRed Indigo Infinity Ivory JOIN_IN JOIN_OUT JungleGreen Khaki LM_DWARF LM_MACHEP LM_SQRT_DWARF LM_SQRT_GIANT LM_USERTOL Label Lavender LavenderBlush LawnGreen Left LeftJustified LeftSide LemonChiffon LightBlue LightCoral LightCyan LightGoldenrodYellow LightGreen LightGrey LightPink LightSalmon LightSeaGreen LightSkyBlue LightSlateGray LightSteelBlue LightYellow Lime LimeGreen Linear Linen Log Logarithmic Magenta Mahogany Mark MarkFill MarkFillable MarkPath Maroon Max MediumAquamarine MediumBlue MediumOrchid MediumPurple MediumSeaGreen MediumSlateBlue MediumSpringGreen MediumTurquoise MediumVioletRed Melon MidPoint MidnightBlue Min MintCream MistyRose Moccasin Move MoveQuiet Mulberry N NE NNE NNW NULL_VERTEX NW NavajoWhite Navy NavyBlue NoAlign NoCrop NoFill NoSide OldLace Olive OliveDrab OliveGreen OrRd Orange OrangeRed Oranges Orchid Ox Oy PC PRGn Paired PaleGoldenrod PaleGreen PaleTurquoise PaleVioletRed PapayaWhip Pastel1 Pastel2 Peach PeachPuff Periwinkle Peru PiYG PineGreen Pink Plum PowderBlue ProcessBlue PuBu PuBuGn PuOr PuRd Purple Purples RELEASE RK2 RK3 RK3BS RK4 RK5 RK5DP RK5F RawSienna RdBu RdGy RdPu RdYlBu RdYlGn Red RedOrange RedViolet Reds Rhodamine Right RightJustified RightSide RosyBrown RoyalBlue RoyalPurple RubineRed S SE SSE SSW SW SaddleBrown Salmon SandyBrown SeaGreen Seashell Sepia Set1 Set2 Set3 Sienna Silver SimpleHead SkyBlue SlateBlue SlateGray Snow Spectral SpringGreen SteelBlue Suppress SuppressQuiet Tan TeXHead Teal TealBlue Thistle Ticksize Tomato Turquoise UnFill Up VERSION Value Vertical Violet VioletRed W WNW WSW Wheat White WhiteSmoke WildStrawberry XHIGH XLOW XYAlign YAlign YHIGH YLOW Yellow YellowGreen YellowOrange YlGn YlGnBu YlOrBr YlOrRd ZHIGH ZLOW _outpipe aboveequationskip addpenarc addpenline align allowstepping angularsystem animationdelay appendsuffix arcarrowangle arcarrowfactor arrow2sizelimit arrowangle arrowbarb arrowdir arrowfactor arrowhookfactor arrowlength arrowsizelimit arrowtexfactor artificialColumn authorpen autumn axis axiscoverage axislabelfactor background backgroundcolor backgroundpen barfactor barmarksizefactor basealign baselinetemplate bernstein beveljoin bigvertexpen bigvertexsize binary black blue bm bone bottom bp bracedefaultratio braceinnerangle bracemidangle braceouterangle brg brown bullet bwr byfoci byvertices camerafactor chartreuse circlemarkradiusfactor circlenodesnumberfactor circleprecision circlescale cividis cm codefile codepen codeskip colorPen coloredNodes coloredSegments conditionlength conicnodesfactor cool coolwarm copper count cputimeformat crossmarksizefactor currentcoordsys currentlight currentpatterns currentpen currentpicture currentposition currentprojection curvilinearsystem cuttings cyan darkblue darkbrown darkcyan darkgray darkgreen darkgrey darkmagenta darkolive darkred dashdotted dashed datepen dateskip debuggerlines debugging deepblue deepcyan deepgray deepgreen deepgrey deepmagenta deepred deepyellow default defaultControl defaultS defaultbackpen defaultcoordsys defaultexcursion defaultfilename defaultformat defaultmassformat defaultpen defaultseparator diamond differentlengths dot dotfactor dotfilltype dotframe dotted doublelinepen doublelinespacing down duplicateFuzz ellipsenodesnumberfactor eps epsgeo epsilon evenodd expansionfactor extendcap fermionpen figureborder figuremattpen file3 firstnode firststep foregroundcolor fuchsia fuzz gapfactor ghostpen gist_earth gist_ncar gist_stern gluonamplitude gluonpen gluonratio gray green grey hatchepsilon havepagenumber heavyblue heavycyan heavygray heavygreen heavygrey heavymagenta heavyred hline hot hsv hwratio hyperbolanodesnumberfactor identity identity4 ignore implicitshipout inch inches includegraphicscommand inf inferno infinity institutionpen intMax intMin invert invisible itempen itemskip itemstep jet labelmargin landscape lastnode left legendhskip legendlinelength legendmargin legendmarkersize legendmaxrelativewidth legendvskip lightblue lightcyan lightgray lightgreen lightgrey lightmagenta lightolive lightred lightyellow linemargin lm_infmsg lm_shortmsg longdashdotted longdashed magenta magma magneticRadius mantissaBits markangleradius markangleradiusfactor markanglespace markanglespacefactor maxDenominator maxrefinements mediumblue mediumcyan mediumgray mediumgreen mediumgrey mediummagenta mediumred mediumyellow middle minDistDefault minblockheight minblockwidth mincirclediameter minipagemargin minipagewidth minvertexangle miterjoin mm momarrowfactor momarrowlength momarrowmargin momarrowoffset momarrowpen monoPen morepoints nCircle nan newbulletcolor ngraph nil nipy_spectral nmesh nobasealign nodeMarginDefault nodesystem nomarker nopoint noprimary nullpath nullpen numarray ocgindex oldbulletcolor olive optimizeTableau orange origin overpaint page pageheight pagemargin pagenumberalign pagenumberpen pagenumberposition pagewidth paleblue palecyan palegray palegreen palegrey palemagenta palered paleyellow parabolanodesnumberfactor perpfactor phi photonamplitude photonpen photonratio pi pink plain plain_bounds plain_scaling plasma plus preamblenodes pt purple r3 r4a r4b randMax realDigits realEpsilon realMax realMin red relativesystem reverse right roundcap roundjoin royalblue salmon saveFunctions scalarpen seismic sequencereal settings signedtrailingzero simplex solid spinner spring springgreen sqrtEpsilon squarecap squarepen startposition stdin stdout stepfactor stepfraction steppagenumberpen stepping stickframe stickmarksizefactor stickmarkspacefactor summer swap tab10 tab20 tab20b tab20c textpen ticksize tildeframe tildemarksizefactor tinv titlealign titlepagepen titlepageposition titlepen titleskip top trailingzero treeLevelStep treeMinNodeWidth treeNodeStep trembleAngle trembleFrequency trembleRandom tubegranularity twilight twilight_shifted undefined unitcircle unitsquare up urlpen urlskip v3dheadertypes v3dtypes version vertexpen vertexsize viewportmargin viewportsize viridis vline white winter wistia wye yellow ylabelwidth zeroTransform zerotickfuzz zerowinding ))
+AliceBlue Align Allow AntiqueWhite Apricot Aqua Aquamarine Aspect Azure BeginPoint Beige Bisque Bittersweet Black BlanchedAlmond Blue BlueGreen BlueViolet Both Break BrickRed Brown BurlyWood BurntOrange CCW CW CadetBlue CarnationPink Center Centered Cerulean Chartreuse Chocolate Coeff Coral CornflowerBlue Cornsilk Crimson Crop Cyan Dandelion DarkBlue DarkCyan DarkGoldenrod DarkGray DarkGreen DarkKhaki DarkMagenta DarkOliveGreen DarkOrange DarkOrchid DarkRed DarkSalmon DarkSeaGreen DarkSlateBlue DarkSlateGray DarkTurquoise DarkViolet DeepPink DeepSkyBlue DefaultHead DimGray DodgerBlue Dotted Down Draw E ENE EPS ESE E_Euler E_PC E_RK2 E_RK3BS Emerald EndPoint Euler Fill FillDraw FireBrick FloralWhite ForestGreen Fuchsia Gainsboro GhostWhite Gold Goldenrod Gray Green GreenYellow Honeydew HookHead Horizontal HotPink I IgnoreAspect IndianRed Indigo Infinity Ivory JOIN_IN JOIN_OUT JungleGreen Khaki LM_DWARF LM_MACHEP LM_SQRT_DWARF LM_SQRT_GIANT LM_USERTOL Label Lavender LavenderBlush LawnGreen Left LeftJustified LeftSide LemonChiffon LightBlue LightCoral LightCyan LightGoldenrodYellow LightGreen LightGrey LightPink LightSalmon LightSeaGreen LightSkyBlue LightSlateGray LightSteelBlue LightYellow Lime LimeGreen Linear Linen Log Logarithmic Magenta Mahogany Mark MarkFill MarkFillable MarkPath Maroon Max MediumAquamarine MediumBlue MediumOrchid MediumPurple MediumSeaGreen MediumSlateBlue MediumSpringGreen MediumTurquoise MediumVioletRed Melon MidPoint MidnightBlue Min MintCream MistyRose Moccasin Move MoveQuiet Mulberry N NE NNE NNW NULL_VERTEX NW NavajoWhite Navy NavyBlue NoAlign NoCrop NoFill NoSide OldLace Olive OliveDrab OliveGreen Orange OrangeRed Orchid Ox Oy PC PaleGoldenrod PaleGreen PaleTurquoise PaleVioletRed PapayaWhip Peach PeachPuff Periwinkle Peru PineGreen Pink Plum PowderBlue ProcessBlue Purple RELEASE RK2 RK3 RK3BS RK4 RK5 RK5DP RK5F RawSienna Red RedOrange RedViolet Rhodamine Right RightJustified RightSide RosyBrown RoyalBlue RoyalPurple RubineRed S SE SSE SSW SW SaddleBrown Salmon SandyBrown SeaGreen Seashell Sepia Sienna Silver SimpleHead SkyBlue SlateBlue SlateGray Snow SpringGreen SteelBlue Suppress SuppressQuiet Tan TeXHead Teal TealBlue Thistle Ticksize Tomato Turquoise UnFill Up VERSION Value Vertical Violet VioletRed W WNW WSW Wheat White WhiteSmoke WildStrawberry XHIGH XLOW XYAlign YAlign YHIGH YLOW Yellow YellowGreen YellowOrange ZHIGH ZLOW _outpipe aboveequationskip addpenarc addpenline align allowstepping angularsystem animationdelay appendsuffix arcarrowangle arcarrowfactor arrow2sizelimit arrowangle arrowbarb arrowdir arrowfactor arrowhookfactor arrowlength arrowsizelimit arrowtexfactor artificialColumn authorpen axis axiscoverage axislabelfactor background backgroundcolor backgroundpen barfactor barmarksizefactor basealign baselinetemplate bernstein beveljoin bigvertexpen bigvertexsize black blue bm bottom bp bracedefaultratio braceinnerangle bracemidangle braceouterangle brown bullet byfoci byvertices camerafactor chartreuse circlemarkradiusfactor circlenodesnumberfactor circleprecision circlescale cm codefile codepen codeskip colorPen coloredNodes coloredSegments conditionlength conicnodesfactor count cputimeformat crossmarksizefactor currentcoordsys currentlight currentpatterns currentpen currentpicture currentposition currentprojection curvilinearsystem cuttings cyan darkblue darkbrown darkcyan darkgray darkgreen darkgrey darkmagenta darkolive darkred dashdotted dashed datepen dateskip debuggerlines debugging deepblue deepcyan deepgray deepgreen deepgrey deepmagenta deepred deepyellow default defaultControl defaultS defaultbackpen defaultcoordsys defaultexcursion defaultfilename defaultformat defaultmassformat defaultpen defaultseparator diamond differentlengths dot dotfactor dotfilltype dotframe dotted doublelinepen doublelinespacing down duplicateFuzz ellipsenodesnumberfactor eps epsgeo epsilon evenodd expansionfactor extendcap fermionpen figureborder figuremattpen file3 firstnode firststep foregroundcolor fuchsia fuzz gapfactor ghostpen gluonamplitude gluonpen gluonratio gray green grey hatchepsilon havepagenumber heavyblue heavycyan heavygray heavygreen heavygrey heavymagenta heavyred hline hwratio hyperbolanodesnumberfactor identity identity4 ignore implicitshipout inch inches includegraphicscommand inf infinity institutionpen intMax intMin invert invisible itempen itemskip itemstep labelmargin landscape lastnode left legendhskip legendlinelength legendmargin legendmarkersize legendmaxrelativewidth legendvskip lightblue lightcyan lightgray lightgreen lightgrey lightmagenta lightolive lightred lightyellow linemargin lm_infmsg lm_shortmsg longdashdotted longdashed magenta magneticRadius mantissaBits markangleradius markangleradiusfactor markanglespace markanglespacefactor maxDenominator maxrefinements mediumblue mediumcyan mediumgray mediumgreen mediumgrey mediummagenta mediumred mediumyellow middle minDistDefault minblockheight minblockwidth mincirclediameter minipagemargin minipagewidth minvertexangle miterjoin mm momarrowfactor momarrowlength momarrowmargin momarrowoffset momarrowpen monoPen morepoints nCircle nan newbulletcolor ngraph nil nmesh nobasealign nodeMarginDefault nodesystem nomarker nopoint noprimary nullpath nullpen numarray ocgindex oldbulletcolor olive optimizeTableau orange origin overpaint page pageheight pagemargin pagenumberalign pagenumberpen pagenumberposition pagewidth paleblue palecyan palegray palegreen palegrey palemagenta palered paleyellow parabolanodesnumberfactor perpfactor phi photonamplitude photonpen photonratio pi pink plain plain_bounds plain_scaling plus preamblenodes pt purple r3 r4a r4b randMax realDigits realEpsilon realMax realMin red relativesystem reverse right roundcap roundjoin royalblue salmon saveFunctions scalarpen sequencereal settings signedtrailingzero simplex solid spinner springgreen sqrtEpsilon squarecap squarepen startposition stdin stdout stepfactor stepfraction steppagenumberpen stepping stickframe stickmarksizefactor stickmarkspacefactor swap textpen ticksize tildeframe tildemarksizefactor tinv titlealign titlepagepen titlepageposition titlepen titleskip top trailingzero treeLevelStep treeMinNodeWidth treeNodeStep trembleAngle trembleFrequency trembleRandom tubegranularity undefined unitcircle unitsquare up urlpen urlskip v3dheadertypes v3dtypes version vertexpen vertexsize viewportmargin viewportsize vline white wye yellow ylabelwidth zeroTransform zerotickfuzz zerowinding ))
diff --git a/Build/source/utils/asymptote/asy.list b/Build/source/utils/asymptote/asy.list
index a4777ca057b..692b732c9a5 100644
--- a/Build/source/utils/asymptote/asy.list
+++ b/Build/source/utils/asymptote/asy.list
@@ -1833,6 +1833,7 @@ real[] intersect(path p, path q, real fuzz=<default>);
real[] intersect(path3 p, path3 q, real fuzz=<default>);
real[] intersect(path3 p, triple[][] p, real fuzz=<default>);
bool interactive();
+string mapArrayString(string From, string To);
real[][] intersections(path p, path q, real fuzz=<default>);
real[] intersections(path p, explicit pair a, explicit pair b, real fuzz=<default>);
real[][] intersections(path3 p, path3 q, real fuzz=<default>);
@@ -1850,7 +1851,6 @@ pen adjust(pen p, real arclength, bool cyclic);
pair Align;
void exit();
real[] uniform(real a, real b, int n);
-void type(string type, string name);
pair viewportsize;
pair viewportmargin;
string VERSION;
@@ -2007,6 +2007,7 @@ pair[][] fft(pair[][] a, int sign=<default>);
pair[][][] fft(pair[][][] a, int sign=<default>);
pair SE;
pen nobasealign;
+sCAD operator init();
real animationdelay;
animation operator init();
frame NoBox(frame f);
@@ -2053,88 +2054,6 @@ bsp operator init();
picture operator cast(face f);
face operator cast(path3 p);
void add(picture pic=<default>, face[] faces, projection P=<default>);
-sCAD operator init();
-list_data Set2;
-list_data YlOrBr;
-list_data YlGn;
-list_data BuPu;
-list_data tab20;
-list_data tab20b;
-list_data tab20c;
-seg_data gist_earth;
-seg_data gist_ncar;
-seg_data gist_stern;
-list_data PuBuGn;
-seg_data hot;
-list_data Blues;
-seg_data autumn;
-list_data PuBu;
-list_data plasma;
-seg_data nipy_spectral;
-seg_data spring;
-list_data Set3;
-list_data Dark2;
-seg_data bone;
-seg_data hsv;
-list_data bwr;
-list_data viridis;
-list_data Reds;
-list_data inferno;
-seg_data copper;
-seg_data pink;
-list_data YlOrRd;
-seg_data gray;
-list_data RdYlGn;
-seg_data CMRmap;
-seg_data winter;
-list_data Greys;
-list_data Purples;
-list_data BuGn;
-list_data Oranges;
-list_data RdGy;
-seg_data binary;
-list_data magma;
-list_data cividis;
-seg_data operator init();
-list_data operator init();
-list_data BrBG;
-list_data seismic;
-list_data Greens;
-list_data YlGnBu;
-list_data PuRd;
-real[] makeMappingArray(int N, triple[] data, real gamma=<default>);
-seg_data coolwarm;
-list_data RdPu;
-list_data RdBu;
-list_data twilight;
-list_data twilight_shifted;
-seg_data wistia;
-list_data brg;
-list_data Pastel1;
-list_data Pastel2;
-list_data GnBu;
-list_data Accent;
-list_data PuOr;
-list_data Spectral;
-list_data PiYG;
-list_data OrRd;
-seg_data cool;
-list_data PRGn;
-list_data Set1;
-list_data tab10;
-list_data Paired;
-seg_data jet;
-seg_data summer;
-list_data RdYlBu;
-surface surface(vertex[][] g);
-weighted operator init();
-bucket operator init();
-vertex operator init();
-object operator init();
-vertex[][] contour3(triple[][][] v, real[][][] f, real[][][] midpoint=<default>, projection P=<default>);
-vertex[][] contour3(real[][][] f, real[][][] midpoint=<default>, triple a, triple b, projection P=<default>);
-vertex[][] contour3(real f(real, real, real), triple a, triple b, int nx=<default>, int ny=<default>, int nz=<default>, projection P=<default>);
-real eps;
segment case1(pair p0, pair p1, int edge);
void draw(picture pic=<default>, Label[] L=<default>, guide[][] g, pen[] p);
void draw(picture pic=<default>, Label[] L=<default>, guide[][] g, pen p=<default>);
@@ -2154,6 +2073,15 @@ guide[][] contour(picture pic=<default>, real f(real, real), pair a, pair b, rea
guide[][] contour(picture pic=<default>, real f(pair), pair a, pair b, real[] c, int nx=<default>, int ny=<default>, guide join(... guide[])=<default>);
guide[][] contour(picture pic=<default>, pair[] z, real[] f, real[] c, guide join(... guide[])=<default>);
real eps;
+surface surface(vertex[][] g);
+weighted operator init();
+bucket operator init();
+vertex operator init();
+object operator init();
+vertex[][] contour3(triple[][][] v, real[][][] f, real[][][] midpoint=<default>, projection P=<default>);
+vertex[][] contour3(real[][][] f, real[][][] midpoint=<default>, triple a, triple b, projection P=<default>);
+vertex[][] contour3(real f(real, real, real), triple a, triple b, int nx=<default>, int ny=<default>, int nz=<default>, projection P=<default>);
+real eps;
void draw(TreeNode root, pair pos);
real treeNodeStep;
void drawAll(TreeNode node, frame f);
@@ -2184,9 +2112,10 @@ void drawVertexTriangle(picture pic=<default>, pair xy, real r=<default>, pen fg
void drawVertexTriangleO(picture pic=<default>, pair xy, real r=<default>, pen fgpen=<default>, bool erasebg=<default>, pen bgpen=<default>);
void drawVertexBoxX(picture pic=<default>, pair xy, real r=<default>, pen fgpen=<default>, bool erasebg=<default>, pen bgpen=<default>);
void do_overpaint(picture pic, path p, pen bgpen, real halfwidth, real vertexangle);
-void texshipout(string stem, picture pic=<default>, bool xalign=<default>);
pen doublelinepen;
real doublelinespacing;
+void texshipout(string stem, picture pic=<default>, bool xalign=<default>);
+bool XYAlign;
void drawDoubleLine(picture pic=<default>, path p, pen fgpen=<default>, real dlspacing=<default>, bool arrow(picture, path, pen, marginT(path, pen))=<default>, bool erasebg=<default>, pen bgpen=<default>, real vertexangle=<default>, real margin=<default>);
void drawScalar(picture pic=<default>, path p, pen fgpen=<default>, bool arrow(picture, path, pen, marginT(path, pen))=<default>, bool erasebg=<default>, pen bgpen=<default>, real vertexangle=<default>, real margin=<default>);
bool overpaint;
@@ -2201,7 +2130,6 @@ real momarrowlength;
real momarrowoffset;
real momarrowmargin;
real momarrowfactor;
-bool XYAlign;
pen vertexpen;
real vertexsize;
path momArrowPath(path p, align align, position pos, real offset=<default>, real length=<default>);
@@ -2214,9 +2142,9 @@ pen bigvertexpen;
real bigvertexsize;
real minvertexangle;
void drawMomArrow(picture pic=<default>, path p, align align, position pos=<default>, real offset=<default>, real length=<default>, pen fgpen=<default>, bool arrow(picture, path, pen, marginT(path, pen))=<default>, bool erasebg=<default>, pen bgpen=<default>, real margin=<default>);
+pen ghostpen;
void fmdefaults();
real linemargin;
-pen ghostpen;
void drawFermion(picture pic=<default>, path p, pen fgpen=<default>, bool arrow(picture, path, pen, marginT(path, pen))=<default>, bool erasebg=<default>, pen bgpen=<default>, real vertexangle=<default>, real margin=<default>);
bool currentarrow(picture, path, pen, marginT(path, pen));
bool currentmomarrow(picture, path, pen, marginT(path, pen));
@@ -2255,6 +2183,8 @@ point midpoint(side side);
point isotomicconjugate(triangle t, point M);
bool Finite(explicit point z);
real rd(real x, real y, real z);
+real[] bangles(picture pic=<default>, parabola p);
+real[][] bangles(picture pic=<default>, hyperbola h);
point circumcenter(point A, point B, point C);
point circumcenter(triangle t);
circle circumcircle(point A, point B, point C);
@@ -2290,12 +2220,18 @@ point point(trilinear tri);
point point(circle c, point M);
point point(circle c, explicit vector v);
bool finite(explicit point p);
+line altitude(vertex V);
+line altitude(side side);
void dot(picture pic=<default>, Label L, explicit point Z, align align=<default>, string format=<default>, pen p=<default>);
real dot(point A, point B);
real dot(point A, explicit pair B);
real dot(explicit pair A, point B);
void dot(picture pic=<default>, Label L, explicit mass M, align align=<default>, string format=<default>, pen p=<default>);
void dot(picture pic=<default>, triangle t, pen p=<default>);
+point isogonalconjugate(triangle t, point M);
+point isogonal(side side, point M);
+line isogonal(vertex V, point M);
+triangle isogonal(triangle t, point M);
real[] realquarticroots(real a, real b, real c, real d, real e);
point origin;
point origin(coordsys R=<default>);
@@ -2329,8 +2265,6 @@ int ellipsenodesnumberfactor;
bool byfoci;
transform reflect(line l);
transform reflect(line l1, line l2, bool safe=<default>);
-real[] bangles(picture pic=<default>, parabola p);
-real[][] bangles(picture pic=<default>, hyperbola h);
abscissa relabscissa(real x);
abscissa relabscissa(int x);
abscissa relabscissa(line l, point M);
@@ -2355,12 +2289,6 @@ void clipdraw(picture pic=<default>, Label L=<default>, path g, align align=<def
real perpfactor;
int conicnodesfactor;
int conicnodesnumber(conic co, real angle1, real angle2, bool dir=<default>);
-line altitude(vertex V);
-line altitude(side side);
-point isogonalconjugate(triangle t, point M);
-point isogonal(side side, point M);
-line isogonal(vertex V, point M);
-triangle isogonal(triangle t, point M);
line hline(coordsys R=<default>);
line hline;
int[] tricoef(side side);
@@ -2429,6 +2357,7 @@ point intouch(side side);
triangle intouch(triangle t);
real rf(real x, real y, real z);
bool concurrent(... line[] l);
+point[] standardizecoordsys(coordsys R=<default>, bool warn=<default> ... point[] M);
real inradius(point A, point B, point C);
real inradius(triangle t);
pen addpenline;
@@ -2501,7 +2430,6 @@ pair coordinates(point M);
real length(explicit point M);
real length(segment s);
int arcnodesnumber(explicit arc a);
-point[] standardizecoordsys(coordsys R=<default>, bool warn=<default> ... point[] M);
int nodesystem;
bool collinear(vector u, vector v);
point centroid(point A, point B, point C);
@@ -2547,6 +2475,7 @@ real arclength(parabola p, real angle);
real arclength(parabola p, real angle1, real angle2);
real arclength(parabola p);
real arclength(arc a);
+bool between(point M, point O, point N);
line reverse(line l);
arc reverse(arc a);
point gergonne(triangle t);
@@ -2585,7 +2514,6 @@ line complementary(explicit line l);
line[] complementary(explicit segment s);
arc complementary(arc a);
point ppoint(arc a, real x);
-bool between(point M, point O, point N);
path fromFocus(conic co, real angle1, real angle2, int n, bool direction);
bool sameside(point M, point N, point O);
bool sameside(point M, point P, line l);
@@ -2602,9 +2530,6 @@ void write(trilinear tri);
triangle incentral(triangle t);
point arcsubtendedcenter(point A, point B, real angle);
real Infinity;
-segment segment(point A, point B);
-segment segment(line l);
-segment segment(explicit side side);
circle circle(explicit point C, real r);
circle circle(point A, point B);
circle circle(segment s);
@@ -2673,6 +2598,7 @@ arc operator -(explicit arc a, vector v);
mass operator -(mass M1, mass M2);
mass operator -(explicit mass M, real x);
mass operator -(explicit mass M, int x);
+transform xscaleO(real x);
pair operator *(coordsys R, pair p);
path operator *(coordsys R, path g);
coordsys operator *(transform t, coordsys R);
@@ -2710,6 +2636,7 @@ circle operator *(inversion i, line l);
circle operator *(inversion i, circle c);
arc operator *(inversion i, segment s);
path operator *(inversion i, triangle t);
+transform yscaleO(real x);
coordsys operator init();
point operator init();
vector operator init();
@@ -2790,16 +2717,14 @@ abscissa operator /(int x, explicit abscissa a);
arc operator /(explicit arc a, real x);
mass operator /(explicit mass M, real x);
mass operator /(explicit mass M, int x);
-real operator ^(point M, explicit circle c);
transform scaleO(real x);
+real operator ^(point M, explicit circle c);
bool operator ==(coordsys c1, coordsys c2);
bool operator ==(explicit point M, explicit point N);
bool operator ==(explicit vector u, explicit vector v);
bool operator ==(line l1, line l2);
bool operator !=(explicit point M, explicit point N);
bool operator !=(line l1, line l2);
-transform xscaleO(real x);
-transform yscaleO(real x);
line[] operator ^^(line l1, line l2);
line[] operator ^^(line l1, line[] l2);
line[] operator ^^(line[] l2, line l1);
@@ -2833,6 +2758,9 @@ real degrees(vector v, coordsys R=<default>, bool warn=<default>);
real degrees(line l, coordsys R=<default>);
real degrees(line l1, line l2);
real degrees(arc a);
+segment segment(point A, point B);
+segment segment(line l);
+segment segment(explicit side side);
real linemargin;
real linemargin();
line Oy(coordsys R=<default>);
@@ -2848,6 +2776,9 @@ point conj(explicit point M);
vector conj(explicit vector u);
hyperbola conj(hyperbola h);
transform vprojection(line l, bool safe=<default>);
+triangle cevian(triangle t, point P);
+point cevian(side side, point P);
+line cevian(vertex V, point P);
parabola parabola(point F, line l);
parabola parabola(point F, point vertex);
parabola parabola(point F, real a, real angle);
@@ -2867,6 +2798,8 @@ transform rotate(explicit vector dir);
transform rotate(explicit point dir);
real EPS;
transform rotateO(real a);
+pair attract(pair m, path g, real fuzz=<default>);
+point attract(point M, path g, real fuzz=<default>);
line perpendicular(point M, line l);
line perpendicular(point M, explicit vector normal);
line perpendicular(point M, explicit pair normal);
@@ -2879,17 +2812,13 @@ void perpendicularmark(picture pic=<default>, point z, vector align, vector dir=
void perpendicularmark(picture pic=<default>, point z, explicit pair align, path g, real size=<default>, pen p=<default>, marginT margin(path, pen)=<default>, filltype filltype=<default>);
void perpendicularmark(picture pic=<default>, point z, vector align, path g, real size=<default>, pen p=<default>, marginT margin(path, pen)=<default>, filltype filltype=<default>);
void perpendicularmark(picture pic=<default>, line l1, line l2, real size=<default>, pen p=<default>, int quarter=<default>, marginT margin(path, pen)=<default>, filltype filltype=<default>);
-pair attract(pair m, path g, real fuzz=<default>);
-point attract(point M, path g, real fuzz=<default>);
void Drawline(picture pic=<default>, Label L=<default>, pair P, bool dirP=<default>, pair Q, bool dirQ=<default>, align align=<default>, pen p=<default>, bool arrow(picture, path, pen, marginT(path, pen))=<default>, Label legend=<default>, marker marker=<default>, path pathModifier(path)=<default>);
bool simeq(point A, point B, real fuzz=<default>);
bool simeq(point a, real b, real fuzz=<default>);
-point inverse(real k, point A, point M);
-circle inverse(real k, point A, line l);
-circle inverse(real k, point A, circle c);
-arc inverse(real k, point A, segment s);
-inversion inversion(real k, point C);
-inversion inversion(point C, real k);
+point inverse(inversion i, point P);
+circle inverse(inversion i, line l);
+circle inverse(inversion i, circle c);
+arc inverse(inversion i, segment s);
inversion inversion(circle c1, circle c2, real sgn=<default>);
inversion inversion(circle c1, circle c2, circle c3);
inversion inversion(circle c);
@@ -2915,9 +2844,6 @@ triangle tangential(triangle t);
triangle pedal(triangle t, point M);
line pedal(side side, point M);
string massformat(string format=<default>, string s, mass M);
-triangle cevian(triangle t, point P);
-point cevian(side side, point P);
-line cevian(vertex V, point P);
int relativesystem;
void drawline(picture pic=<default>, triangle t, pen p=<default>);
void addMargins(picture pic=<default>, real lmargin=<default>, real bmargin=<default>, real rmargin=<default>, real tmargin=<default>, bool rigid=<default>, bool allObject=<default>);
@@ -2939,127 +2865,6 @@ abscissa curabscissa(ellipse el, point M);
abscissa curabscissa(parabola p, point M);
abscissa curabscissa(conic co, point M);
abscissa curabscissa(arc a, point M);
-locateT operator init();
-void Straight(flatguide3)(... void(flatguide3)[]);
-void graph(flatguide3)(triple F(real), real, real, int)(void join(flatguide3)(... void(flatguide3)[]));
-void(flatguide3)[] graph(triple F(real), real, real, int)(void join(flatguide3)(... void(flatguide3)[]), bool3 cond(real));
-void graph(flatguide3)(picture pic=<default>, real x(real), real y(real), real z(real), real a, real b, int n=<default>, void join(flatguide3)(... void(flatguide3)[])=<default>);
-void(flatguide3)[] graph(picture pic=<default>, real x(real), real y(real), real z(real), real a, real b, int n=<default>, bool3 cond(real), void join(flatguide3)(... void(flatguide3)[])=<default>);
-void graph(flatguide3)(picture pic=<default>, triple v(real), real a, real b, int n=<default>, void join(flatguide3)(... void(flatguide3)[])=<default>);
-void(flatguide3)[] graph(picture pic=<default>, triple v(real), real a, real b, int n=<default>, bool3 cond(real), void join(flatguide3)(... void(flatguide3)[])=<default>);
-void graph(flatguide3)(picture pic=<default>, triple[] v, void join(flatguide3)(... void(flatguide3)[])=<default>);
-void(flatguide3)[] graph(picture pic=<default>, triple[] v, bool3[] cond, void join(flatguide3)(... void(flatguide3)[])=<default>);
-void graph(flatguide3)(picture pic=<default>, real[] x, real[] y, real[] z, void join(flatguide3)(... void(flatguide3)[])=<default>);
-void(flatguide3)[] graph(picture pic=<default>, real[] x, real[] y, real[] z, bool3[] cond, void join(flatguide3)(... void(flatguide3)[])=<default>);
-void graph(flatguide3)(triple F(path, real), path p, int n=<default>, void join(flatguide3)(... void(flatguide3)[])=<default>);
-void graph(flatguide3)(triple F(pair), path p, int n=<default>, void join(flatguide3)(... void(flatguide3)[])=<default>);
-void graph(flatguide3)(picture pic=<default>, real f(pair), path p, int n=<default>, void join(flatguide3)(... void(flatguide3)[])=<default>);
-void graph(flatguide3)(real f(pair), path p, int n=<default>, real T(pair), void join(flatguide3)(... void(flatguide3)[])=<default>);
-void(flatguide3)[][] lift(real f(real x, real y), guide[][] g, void join(flatguide3)(... void(flatguide3)[])=<default>);
-void(flatguide3)[][] lift(real f(pair z), guide[][] g, void join(flatguide3)(... void(flatguide3)[])=<default>);
-triple polar(real r, real theta, real phi);
-void polargraph(flatguide3)(real r(real, real), real theta(real), real phi(real), int n=<default>, void join(flatguide3)(... void(flatguide3)[])=<default>);
-bool uperiodic(real[][] a);
-bool uperiodic(triple[][] a);
-bool vperiodic(real[][] a);
-bool vperiodic(triple[][] a);
-void OutTicks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>)(Label format=<default>, string ticklabel(real)=<default>, bool beginlabel=<default>, bool endlabel=<default>, int N=<default>, int n=<default>, real Step=<default>, real step=<default>, bool begin=<default>, bool end=<default>, tickvalues modify(tickvalues)=<default>, real Size=<default>, real size=<default>, bool extend=<default>, pen pTick=<default>, pen ptick=<default>);
-void OutTicks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>)(Label format=<default>, string ticklabel(real)=<default>, bool beginlabel=<default>, bool endlabel=<default>, real[] Ticks, real[] ticks=<default>, real Size=<default>, real size=<default>, bool extend=<default>, pen pTick=<default>, pen ptick=<default>);
-void OutTicks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>);
-void axis(picture pic=<default>, Label L=<default>, path3 g, path3 g2=<default>, pen p=<default>, void ticks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>), ticklocate locate, bool arrow(picture, path3, material, marginT3(path3, pen), light, light)=<default>, marginT3 margin(path3, pen)=<default>, int[] divisor=<default>, bool above=<default>, bool opposite=<default>);
-void Bounds(picture, axisT)(int type=<default>, int type2=<default>, triple align=<default>, bool extend=<default>);
-void Bounds(picture, axisT);
-void xaxis3At(picture pic=<default>, Label L=<default>, void axis(picture, axisT), real xmin=<default>, real xmax=<default>, pen p=<default>, void ticks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>)=<default>, bool arrow(picture, path3, material, marginT3(path3, pen), light, light)=<default>, marginT3 margin(path3, pen)=<default>, bool above=<default>, bool opposite=<default>, bool opposite2=<default>, bool primary=<default>);
-void yaxis3At(picture pic=<default>, Label L=<default>, void axis(picture, axisT), real ymin=<default>, real ymax=<default>, pen p=<default>, void ticks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>)=<default>, bool arrow(picture, path3, material, marginT3(path3, pen), light, light)=<default>, marginT3 margin(path3, pen)=<default>, bool above=<default>, bool opposite=<default>, bool opposite2=<default>, bool primary=<default>);
-void zaxis3At(picture pic=<default>, Label L=<default>, void axis(picture, axisT), real zmin=<default>, real zmax=<default>, pen p=<default>, void ticks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>)=<default>, bool arrow(picture, path3, material, marginT3(path3, pen), light, light)=<default>, marginT3 margin(path3, pen)=<default>, bool above=<default>, bool opposite=<default>, bool opposite2=<default>, bool primary=<default>);
-void xaxis3(picture pic=<default>, Label L=<default>, void axis(picture, axisT)=<default>, real xmin=<default>, real xmax=<default>, pen p=<default>, void ticks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>)=<default>, bool arrow(picture, path3, material, marginT3(path3, pen), light, light)=<default>, marginT3 margin(path3, pen)=<default>, bool above=<default>);
-void yaxis3(picture pic=<default>, Label L=<default>, void axis(picture, axisT)=<default>, real ymin=<default>, real ymax=<default>, pen p=<default>, void ticks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>)=<default>, bool arrow(picture, path3, material, marginT3(path3, pen), light, light)=<default>, marginT3 margin(path3, pen)=<default>, bool above=<default>);
-void zaxis3(picture pic=<default>, Label L=<default>, void axis(picture, axisT)=<default>, real zmin=<default>, real zmax=<default>, pen p=<default>, void ticks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>)=<default>, bool arrow(picture, path3, material, marginT3(path3, pen), light, light)=<default>, marginT3 margin(path3, pen)=<default>, bool above=<default>);
-void XZZero(picture, axisT)(triple align=<default>, bool extend=<default>);
-void XZZero(picture, axisT);
-void YZZero(picture, axisT)(triple align=<default>, bool extend=<default>);
-void YZZero(picture, axisT);
-surface surface(picture pic=<default>, triple[][] f, bool[][] cond=<default>);
-surface surface(picture pic=<default>, real[][] f, real[] x, real[] y, real[] xsplinetype(real[], real[])=<default>, real[] ysplinetype(real[], real[])=<default>, bool[][] cond=<default>);
-surface surface(picture pic=<default>, real[][] f, pair a, pair b, real[] xsplinetype(real[], real[]), real[] ysplinetype(real[], real[])=<default>, bool[][] cond=<default>);
-surface surface(picture pic=<default>, real[][] f, pair a, pair b, bool[][] cond=<default>);
-surface surface(picture pic=<default>, triple f(pair z), pair a, pair b, int nu=<default>, int nv=<default>, bool cond(pair z)=<default>);
-surface surface(picture pic=<default>, triple f(pair z), real[] u, real[] v, real[](real[], real[])[] usplinetype, real[](real[], real[])[] vsplinetype=<default>, bool cond(pair z)=<default>);
-surface surface(picture pic=<default>, triple f(pair z), pair a, pair b, int nu=<default>, int nv=<default>, real[](real[], real[])[] usplinetype, real[](real[], real[])[] vsplinetype=<default>, bool cond(pair z)=<default>);
-surface surface(picture pic=<default>, real f(pair z), pair a, pair b, int nx=<default>, int ny=<default>, bool cond(pair z)=<default>);
-surface surface(picture pic=<default>, real f(pair z), pair a, pair b, int nx=<default>, int ny=<default>, real[] xsplinetype(real[], real[]), real[] ysplinetype(real[], real[])=<default>, bool cond(pair z)=<default>);
-void XYEquals(picture, axisT)(real x, real y, triple align=<default>, bool extend=<default>);
-triple Dir(real)(triple dir);
-void draw(picture pic=<default>, Label[] L=<default>, void(flatguide3)[][] g, pen[] p, light light=<default>, string name=<default>, render render=<default>, interaction interaction=<default>);
-void draw(picture pic=<default>, Label[] L=<default>, void(flatguide3)[][] g, pen p=<default>, light light=<default>, string name=<default>, render render=<default>, interaction interaction=<default>);
-void Ticks3(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>)(int sign, Label F=<default>, string ticklabel(real)=<default>, bool beginlabel=<default>, bool endlabel=<default>, real[] Ticks=<default>, real[] ticks=<default>, int N=<default>, bool begin=<default>, bool end=<default>, real Size=<default>, real size=<default>, bool extend=<default>, pen pTick=<default>, pen ptick=<default>);
-void Ticks3(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>)(int sign, Label F=<default>, string ticklabel(real)=<default>, bool beginlabel=<default>, bool endlabel=<default>, int N, int n=<default>, real Step=<default>, real step=<default>, bool begin=<default>, bool end=<default>, tickvalues modify(tickvalues)=<default>, real Size=<default>, real size=<default>, bool extend=<default>, pen pTick=<default>, pen ptick=<default>);
-real maxlength(triple f(pair z), pair a, pair b, int nu, int nv);
-void drawtick(picture pic, real[][] T, path3 g, path3 g2, ticklocate locate, real val, real Size, int sign, pen p, bool extend);
-triple tickMin3(picture pic);
-triple tickMax3(picture pic);
-triple Scale(picture pic=<default>, triple v);
-triple[][] Scale(picture pic=<default>, triple[][] P);
-real ScaleX(picture pic=<default>, real x);
-real ScaleY(picture pic=<default>, real y);
-real ScaleZ(picture pic=<default>, real z);
-real[][] ScaleZ(picture pic=<default>, real[][] P);
-picture vectorfield(path3 vector(pair v), triple f(pair z), pair a, pair b, int nu=<default>, int nv=<default>, bool truesize=<default>, real maxlength=<default>, bool cond(pair z)=<default>, pen p=<default>, bool arrow(picture, path3, material, marginT3(path3, pen), light, light)=<default>, marginT3 margin(path3, pen)=<default>, string name=<default>, render render=<default>);
-path3 Circle(triple c, real r, triple normal=<default>, int n=<default>);
-void InTicks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>)(Label format=<default>, string ticklabel(real)=<default>, bool beginlabel=<default>, bool endlabel=<default>, int N=<default>, int n=<default>, real Step=<default>, real step=<default>, bool begin=<default>, bool end=<default>, tickvalues modify(tickvalues)=<default>, real Size=<default>, real size=<default>, bool extend=<default>, pen pTick=<default>, pen ptick=<default>);
-void InTicks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>)(Label format=<default>, string ticklabel(real)=<default>, bool beginlabel=<default>, bool endlabel=<default>, real[] Ticks, real[] ticks=<default>, real Size=<default>, real size=<default>, bool extend=<default>, pen pTick=<default>, pen ptick=<default>);
-void InTicks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>);
-void Spline(flatguide3)(... void(flatguide3)[]);
-void InOutTicks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>)(Label format=<default>, string ticklabel(real)=<default>, bool beginlabel=<default>, bool endlabel=<default>, int N=<default>, int n=<default>, real Step=<default>, real step=<default>, bool begin=<default>, bool end=<default>, tickvalues modify(tickvalues)=<default>, real Size=<default>, real size=<default>, bool extend=<default>, pen pTick=<default>, pen ptick=<default>);
-void InOutTicks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>)(Label format=<default>, string ticklabel(real)=<default>, bool beginlabel=<default>, bool endlabel=<default>, real[] Ticks, real[] ticks=<default>, real Size=<default>, real size=<default>, bool extend=<default>, pen pTick=<default>, pen ptick=<default>);
-void InOutTicks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>);
-void axes3(picture pic=<default>, Label xlabel=<default>, Label ylabel=<default>, Label zlabel=<default>, bool extend=<default>, triple min=<default>, triple max=<default>, pen p=<default>, bool arrow(picture, path3, material, marginT3(path3, pen), light, light)=<default>, marginT3 margin(path3, pen)=<default>);
-void label(picture pic, Label L, triple v, real x, align align, string format, pen p);
-void labelx(picture pic=<default>, Label L=<default>, triple v, align align=<default>, string format=<default>, pen p=<default>);
-void labelx3(picture pic=<default>, Label L=<default>, real x, align align=<default>, string format=<default>, pen p=<default>);
-void labeltick(picture pic, real[][] T, path3 g, ticklocate locate, real val, int sign, real Size, string ticklabel(real), Label F, real norm=<default>);
-void labelaxis(picture pic, real[][] T, Label L, path3 g, ticklocate locate=<default>, int sign=<default>, bool ticklabels=<default>);
-void labely(picture pic=<default>, Label L=<default>, triple v, align align=<default>, string format=<default>, pen p=<default>);
-void labely3(picture pic=<default>, Label L=<default>, real y, align align=<default>, string format=<default>, pen p=<default>);
-void labelz(picture pic=<default>, Label L=<default>, triple v, align align=<default>, string format=<default>, pen p=<default>);
-void labelz3(picture pic=<default>, Label L=<default>, real z, align align=<default>, string format=<default>, pen p=<default>);
-void autoscale3(picture pic=<default>, void axis(picture, axisT));
-void xtick(picture pic=<default>, triple v, triple dir=<default>, real size=<default>, pen p=<default>);
-void xtick(picture pic=<default>, Label L, triple v, triple dir=<default>, string format=<default>, real size=<default>, pen p=<default>);
-void xtick3(picture pic=<default>, real x, triple dir=<default>, real size=<default>, pen p=<default>);
-void xtick3(picture pic=<default>, Label L, real x, triple dir=<default>, string format=<default>, real size=<default>, pen p=<default>);
-void ytick(picture pic=<default>, triple v, triple dir=<default>, real size=<default>, pen p=<default>);
-void ytick(picture pic=<default>, Label L, triple v, triple dir=<default>, string format=<default>, real size=<default>, pen p=<default>);
-void ytick3(picture pic=<default>, real y, triple dir=<default>, real size=<default>, pen p=<default>);
-void ytick3(picture pic=<default>, Label L, real y, triple dir=<default>, string format=<default>, real size=<default>, pen p=<default>);
-void ztick(picture pic=<default>, triple v, triple dir=<default>, real size=<default>, pen p=<default>);
-void ztick(picture pic=<default>, Label L, triple v, triple dir=<default>, string format=<default>, real size=<default>, pen p=<default>);
-void ztick3(picture pic=<default>, real z, triple dir=<default>, real size=<default>, pen p=<default>);
-void ztick3(picture pic=<default>, Label L, real z, triple dir=<default>, string format=<default>, real size=<default>, pen p=<default>);
-triple defaultdir(triple X, triple Y, triple Z, bool opposite=<default>, projection P);
-real xtrans(real[][] t, real x);
-real ytrans(real[][] t, real y);
-real ztrans(real[][] t, real z);
-ticklocate ticklocate(real a, real b, autoscaleT S=<default>, real tickmin=<default>, real tickmax=<default>, real time(real)=<default>, triple dir(real));
-triple ticklabelshift(triple align, pen p=<default>);
-path3 Arc(triple c, triple v1, triple v2, triple normal=<default>, bool direction=<default>, int n=<default>);
-path3 Arc(triple c, real r, real theta1, real phi1, real theta2, real phi2, triple normal=<default>, bool direction, int n=<default>);
-path3 Arc(triple c, real r, real theta1, real phi1, real theta2, real phi2, triple normal=<default>, int n=<default>);
-void limits(picture pic=<default>, triple min, triple max);
-void XZEquals(picture, axisT)(real x, real z, triple align=<default>, bool extend=<default>);
-void YZEquals(picture, axisT)(real y, real z, triple align=<default>, bool extend=<default>);
-void XYZero(picture, axisT)(triple align=<default>, bool extend=<default>);
-void XYZero(picture, axisT);
-void zlimits(picture pic=<default>, real min=<default>, real max=<default>, bool crop=<default>);
-void tick(picture pic=<default>, triple v, triple dir, real size=<default>, pen p=<default>);
-void tick(picture pic=<default>, Label L, real value, triple v, triple dir, string format=<default>, real size=<default>, pen p=<default>);
-surface bispline(real[][] z, real[][] p, real[][] q, real[][] r, real[] x, real[] y, bool[][] cond=<default>);
-real[][][] bispline(real[][] f, real[] x, real[] y, real[] xsplinetype(real[], real[])=<default>, real[] ysplinetype(real[], real[])=<default>, bool[][] cond=<default>);
-real[][][] bispline0(real[][] z, real[][] p, real[][] q, real[][] r, real[] x, real[] y, bool[][] cond=<default>);
-path3[] segment(triple[] v, bool[] cond, void join(flatguide3)(... void(flatguide3)[])=<default>);
-real[] uniform(real T(real x), real Tinv(real x), real a, real b, int n);
-void NoTicks3(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>)();
-void NoTicks3(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>);
string DefaultFormat(real);
string DefaultLogFormat(real)(int base);
string DefaultLogFormat(real);
@@ -3103,6 +2908,9 @@ picture vectorfield(path vector(pair), pair a, pair b, int nx=<default>, int ny=
string OmitFormat(real)(string s=<default> ... real[] x);
guide Straight(... guide[]);
int Min;
+tickvalues OmitTickIntervals(tickvalues)(real[] a, real[] b);
+tickvalues OmitTickInterval(tickvalues)(real a, real b);
+tickvalues OmitTick(tickvalues)(... real[] x);
string trailingzero;
void label(picture pic, Label L, pair z, real x, align align, string format, pen p);
void labelx(picture pic=<default>, Label L=<default>, explicit pair z, align align=<default>, string format=<default>, pen p=<default>);
@@ -3111,11 +2919,11 @@ void labelx(picture pic=<default>, Label L, string format=<default>, explicit pe
path Arc(pair c, real r, real angle1, real angle2, bool direction, int n=<default>);
path Arc(pair c, real r, real angle1, real angle2, int n=<default>);
path Arc(pair c, explicit pair z1, explicit pair z2, bool direction=<default>, int n=<default>);
-pair labeltick(frame d, transform T, path g, ticklocate locate, real val, pair side, int sign, real Size, string ticklabel(real), Label F, real norm=<default>);
-void labelaxis(frame f, transform T, Label L, path g, ticklocate locate=<default>, int sign=<default>, bool ticklabels=<default>);
void labely(picture pic=<default>, Label L=<default>, explicit pair z, align align=<default>, string format=<default>, pen p=<default>);
void labely(picture pic=<default>, Label L=<default>, real y, align align=<default>, string format=<default>, pen p=<default>);
void labely(picture pic=<default>, Label L, string format=<default>, explicit pen p=<default>);
+pair labeltick(frame d, transform T, path g, ticklocate locate, real val, pair side, int sign, real Size, string ticklabel(real), Label F, real norm=<default>);
+void labelaxis(frame f, transform T, Label L, path g, ticklocate locate=<default>, int sign=<default>, bool ticklabels=<default>);
void xtick(picture pic=<default>, explicit pair z, pair dir=<default>, real size=<default>, pen p=<default>);
void xtick(picture pic=<default>, real x, pair dir=<default>, real size=<default>, pen p=<default>);
void xtick(picture pic=<default>, Label L, explicit pair z, pair dir=<default>, string format=<default>, real size=<default>, pen p=<default>);
@@ -3133,17 +2941,20 @@ scaleT Linear(bool automin=<default>, bool automax=<default>, real s=<default>,
pair tickMin(picture pic);
pair tickMax(picture pic);
string autoformat(string format=<default>, real norm ... real[] a);
-tickvalues OmitTickIntervals(tickvalues)(real[] a, real[] b);
-tickvalues OmitTickInterval(tickvalues)(real a, real b);
-tickvalues OmitTick(tickvalues)(... real[] x);
real linear(real)(real S(real x)=<default>, real Min, real Max);
pair polar(real r, real theta);
string Format(real)(string s=<default>);
guide polargraph(picture pic=<default>, real r(real), real a, real b, int n=<default>, guide join(... guide[])=<default>);
guide polargraph(picture pic=<default>, real[] r, real[] theta, guide join(... guide[])=<default>);
+void xaxisAt(picture pic=<default>, Label L=<default>, void axis(picture, axisT), real xmin=<default>, real xmax=<default>, pen p=<default>, void ticks(frame, transform, Label, pair, path, path, pen, bool(picture, path, pen, marginT(path, pen)), marginT(path, pen), ticklocate, int[], bool opposite=<default>)=<default>, bool arrow(picture, path, pen, marginT(path, pen))=<default>, marginT margin(path, pen)=<default>, bool above=<default>, bool opposite=<default>);
+void yaxisAt(picture pic=<default>, Label L=<default>, void axis(picture, axisT), real ymin=<default>, real ymax=<default>, pen p=<default>, void ticks(frame, transform, Label, pair, path, path, pen, bool(picture, path, pen, marginT(path, pen)), marginT(path, pen), ticklocate, int[], bool opposite=<default>)=<default>, bool arrow(picture, path, pen, marginT(path, pen))=<default>, marginT margin(path, pen)=<default>, bool above=<default>, bool opposite=<default>);
+void xaxis(picture pic=<default>, Label L=<default>, void axis(picture, axisT)=<default>, real xmin=<default>, real xmax=<default>, pen p=<default>, void ticks(frame, transform, Label, pair, path, path, pen, bool(picture, path, pen, marginT(path, pen)), marginT(path, pen), ticklocate, int[], bool opposite=<default>)=<default>, bool arrow(picture, path, pen, marginT(path, pen))=<default>, marginT margin(path, pen)=<default>, bool above=<default>);
+void yaxis(picture pic=<default>, Label L=<default>, void axis(picture, axisT)=<default>, real ymin=<default>, real ymax=<default>, pen p=<default>, void ticks(frame, transform, Label, pair, path, path, pen, bool(picture, path, pen, marginT(path, pen)), marginT(path, pen), ticklocate, int[], bool opposite=<default>)=<default>, bool arrow(picture, path, pen, marginT(path, pen))=<default>, marginT margin(path, pen)=<default>, bool above=<default>, bool autorotate=<default>);
void LeftTicks(frame, transform, Label, pair, path, path, pen, bool(picture, path, pen, marginT(path, pen)), marginT(path, pen), ticklocate, int[], bool opposite=<default>)(Label format=<default>, string ticklabel(real)=<default>, bool beginlabel=<default>, bool endlabel=<default>, int N=<default>, int n=<default>, real Step=<default>, real step=<default>, bool begin=<default>, bool end=<default>, tickvalues modify(tickvalues)=<default>, real Size=<default>, real size=<default>, bool extend=<default>, pen pTick=<default>, pen ptick=<default>);
void LeftTicks(frame, transform, Label, pair, path, path, pen, bool(picture, path, pen, marginT(path, pen)), marginT(path, pen), ticklocate, int[], bool opposite=<default>)(Label format=<default>, string ticklabel(real)=<default>, bool beginlabel=<default>, bool endlabel=<default>, real[] Ticks, real[] ticks=<default>, real Size=<default>, real size=<default>, bool extend=<default>, pen pTick=<default>, pen ptick=<default>);
void LeftTicks(frame, transform, Label, pair, path, path, pen, bool(picture, path, pen, marginT(path, pen)), marginT(path, pen), ticklocate, int[], bool opposite=<default>);
+tickvalues NoZero(tickvalues);
+string NoZeroFormat(real);
guide Hermite(... guide[])(real[] splinetype(real[], real[]));
guide Hermite(... guide[]);
path Circle(pair c, real r, int n=<default>);
@@ -3162,7 +2973,6 @@ pair Scale(picture pic=<default>, pair z);
real ScaleX(picture pic=<default>, real x);
real ScaleY(picture pic=<default>, real y);
tickvalues generateticks(int sign, Label F=<default>, string ticklabel(real)=<default>, int N, int n=<default>, real Step=<default>, real step=<default>, real Size=<default>, real size=<default>, transform T, pair side, path g, real limit, pen p, ticklocate locate, int[] divisor, bool opposite);
-path[] segment(pair[] z, bool[] cond, guide join(... guide[])=<default>);
void checkconditionlength(int x, int y);
real xtrans(transform t, real x);
void Top(picture, axisT)(bool extend=<default>);
@@ -3170,7 +2980,6 @@ void Top(picture, axisT);
real ytrans(transform t, real y);
void scale(picture pic=<default>, scaleT x, scaleT y=<default>, scaleT z=<default>);
void scale(picture pic=<default>, bool xautoscale=<default>, bool yautoscale=<default>, bool zautoscale=<default>);
-string NoZeroFormat(real);
int[] divisors(int a, int b);
scientific operator init();
bounds operator init();
@@ -3178,14 +2987,10 @@ ticklocate operator init();
locateT operator init();
tickvalues operator init();
axisT operator init();
-tickvalues NoZero(tickvalues);
int Both;
void axes(picture pic=<default>, Label xlabel=<default>, Label ylabel=<default>, bool extend=<default>, pair min=<default>, pair max=<default>, pen p=<default>, bool arrow(picture, path, pen, marginT(path, pen))=<default>, marginT margin(path, pen)=<default>, bool above=<default>);
string signedtrailingzero;
-void xaxisAt(picture pic=<default>, Label L=<default>, void axis(picture, axisT), real xmin=<default>, real xmax=<default>, pen p=<default>, void ticks(frame, transform, Label, pair, path, path, pen, bool(picture, path, pen, marginT(path, pen)), marginT(path, pen), ticklocate, int[], bool opposite=<default>)=<default>, bool arrow(picture, path, pen, marginT(path, pen))=<default>, marginT margin(path, pen)=<default>, bool above=<default>, bool opposite=<default>);
-void yaxisAt(picture pic=<default>, Label L=<default>, void axis(picture, axisT), real ymin=<default>, real ymax=<default>, pen p=<default>, void ticks(frame, transform, Label, pair, path, path, pen, bool(picture, path, pen, marginT(path, pen)), marginT(path, pen), ticklocate, int[], bool opposite=<default>)=<default>, bool arrow(picture, path, pen, marginT(path, pen))=<default>, marginT margin(path, pen)=<default>, bool above=<default>, bool opposite=<default>);
-void xaxis(picture pic=<default>, Label L=<default>, void axis(picture, axisT)=<default>, real xmin=<default>, real xmax=<default>, pen p=<default>, void ticks(frame, transform, Label, pair, path, path, pen, bool(picture, path, pen, marginT(path, pen)), marginT(path, pen), ticklocate, int[], bool opposite=<default>)=<default>, bool arrow(picture, path, pen, marginT(path, pen))=<default>, marginT margin(path, pen)=<default>, bool above=<default>);
-void yaxis(picture pic=<default>, Label L=<default>, void axis(picture, axisT)=<default>, real ymin=<default>, real ymax=<default>, pen p=<default>, void ticks(frame, transform, Label, pair, path, path, pen, bool(picture, path, pen, marginT(path, pen)), marginT(path, pen), ticklocate, int[], bool opposite=<default>)=<default>, bool arrow(picture, path, pen, marginT(path, pen))=<default>, marginT margin(path, pen)=<default>, bool above=<default>, bool autorotate=<default>);
+path[] segment(pair[] z, bool[] cond, guide join(... guide[])=<default>);
ticklocate ticklocate(real a, real b, autoscaleT S=<default>, real tickmin=<default>, real tickmax=<default>, real time(real)=<default>, pair dir(real)=<default>);
pair ticklabelshift(pair align, pen p=<default>);
pair zero(real);
@@ -3219,6 +3024,127 @@ void autoscale(picture pic=<default>, void axis(picture, axisT));
guide Spline(... guide[]);
void LeftRight(picture, axisT)(bool extend=<default>);
void LeftRight(picture, axisT);
+path3[] segment(triple[] v, bool[] cond, void join(flatguide3)(... void(flatguide3)[])=<default>);
+locateT operator init();
+void Straight(flatguide3)(... void(flatguide3)[]);
+void graph(flatguide3)(triple F(real), real, real, int)(void join(flatguide3)(... void(flatguide3)[]));
+void(flatguide3)[] graph(triple F(real), real, real, int)(void join(flatguide3)(... void(flatguide3)[]), bool3 cond(real));
+void graph(flatguide3)(picture pic=<default>, real x(real), real y(real), real z(real), real a, real b, int n=<default>, void join(flatguide3)(... void(flatguide3)[])=<default>);
+void(flatguide3)[] graph(picture pic=<default>, real x(real), real y(real), real z(real), real a, real b, int n=<default>, bool3 cond(real), void join(flatguide3)(... void(flatguide3)[])=<default>);
+void graph(flatguide3)(picture pic=<default>, triple v(real), real a, real b, int n=<default>, void join(flatguide3)(... void(flatguide3)[])=<default>);
+void(flatguide3)[] graph(picture pic=<default>, triple v(real), real a, real b, int n=<default>, bool3 cond(real), void join(flatguide3)(... void(flatguide3)[])=<default>);
+void graph(flatguide3)(picture pic=<default>, triple[] v, void join(flatguide3)(... void(flatguide3)[])=<default>);
+void(flatguide3)[] graph(picture pic=<default>, triple[] v, bool3[] cond, void join(flatguide3)(... void(flatguide3)[])=<default>);
+void graph(flatguide3)(picture pic=<default>, real[] x, real[] y, real[] z, void join(flatguide3)(... void(flatguide3)[])=<default>);
+void(flatguide3)[] graph(picture pic=<default>, real[] x, real[] y, real[] z, bool3[] cond, void join(flatguide3)(... void(flatguide3)[])=<default>);
+void graph(flatguide3)(triple F(path, real), path p, int n=<default>, void join(flatguide3)(... void(flatguide3)[])=<default>);
+void graph(flatguide3)(triple F(pair), path p, int n=<default>, void join(flatguide3)(... void(flatguide3)[])=<default>);
+void graph(flatguide3)(picture pic=<default>, real f(pair), path p, int n=<default>, void join(flatguide3)(... void(flatguide3)[])=<default>);
+void graph(flatguide3)(real f(pair), path p, int n=<default>, real T(pair), void join(flatguide3)(... void(flatguide3)[])=<default>);
+void(flatguide3)[][] lift(real f(real x, real y), guide[][] g, void join(flatguide3)(... void(flatguide3)[])=<default>);
+void(flatguide3)[][] lift(real f(pair z), guide[][] g, void join(flatguide3)(... void(flatguide3)[])=<default>);
+triple polar(real r, real theta, real phi);
+void polargraph(flatguide3)(real r(real, real), real theta(real), real phi(real), int n=<default>, void join(flatguide3)(... void(flatguide3)[])=<default>);
+bool uperiodic(real[][] a);
+bool uperiodic(triple[][] a);
+bool vperiodic(real[][] a);
+bool vperiodic(triple[][] a);
+void OutTicks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>)(Label format=<default>, string ticklabel(real)=<default>, bool beginlabel=<default>, bool endlabel=<default>, int N=<default>, int n=<default>, real Step=<default>, real step=<default>, bool begin=<default>, bool end=<default>, tickvalues modify(tickvalues)=<default>, real Size=<default>, real size=<default>, bool extend=<default>, pen pTick=<default>, pen ptick=<default>);
+void OutTicks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>)(Label format=<default>, string ticklabel(real)=<default>, bool beginlabel=<default>, bool endlabel=<default>, real[] Ticks, real[] ticks=<default>, real Size=<default>, real size=<default>, bool extend=<default>, pen pTick=<default>, pen ptick=<default>);
+void OutTicks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>);
+void axis(picture pic=<default>, Label L=<default>, path3 g, path3 g2=<default>, pen p=<default>, void ticks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>), ticklocate locate, bool arrow(picture, path3, material, marginT3(path3, pen), light, light)=<default>, marginT3 margin(path3, pen)=<default>, int[] divisor=<default>, bool above=<default>, bool opposite=<default>);
+void Bounds(picture, axisT)(int type=<default>, int type2=<default>, triple align=<default>, bool extend=<default>);
+void Bounds(picture, axisT);
+void xaxis3At(picture pic=<default>, Label L=<default>, void axis(picture, axisT), real xmin=<default>, real xmax=<default>, pen p=<default>, void ticks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>)=<default>, bool arrow(picture, path3, material, marginT3(path3, pen), light, light)=<default>, marginT3 margin(path3, pen)=<default>, bool above=<default>, bool opposite=<default>, bool opposite2=<default>, bool primary=<default>);
+void yaxis3At(picture pic=<default>, Label L=<default>, void axis(picture, axisT), real ymin=<default>, real ymax=<default>, pen p=<default>, void ticks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>)=<default>, bool arrow(picture, path3, material, marginT3(path3, pen), light, light)=<default>, marginT3 margin(path3, pen)=<default>, bool above=<default>, bool opposite=<default>, bool opposite2=<default>, bool primary=<default>);
+void zaxis3At(picture pic=<default>, Label L=<default>, void axis(picture, axisT), real zmin=<default>, real zmax=<default>, pen p=<default>, void ticks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>)=<default>, bool arrow(picture, path3, material, marginT3(path3, pen), light, light)=<default>, marginT3 margin(path3, pen)=<default>, bool above=<default>, bool opposite=<default>, bool opposite2=<default>, bool primary=<default>);
+void xaxis3(picture pic=<default>, Label L=<default>, void axis(picture, axisT)=<default>, real xmin=<default>, real xmax=<default>, pen p=<default>, void ticks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>)=<default>, bool arrow(picture, path3, material, marginT3(path3, pen), light, light)=<default>, marginT3 margin(path3, pen)=<default>, bool above=<default>);
+void yaxis3(picture pic=<default>, Label L=<default>, void axis(picture, axisT)=<default>, real ymin=<default>, real ymax=<default>, pen p=<default>, void ticks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>)=<default>, bool arrow(picture, path3, material, marginT3(path3, pen), light, light)=<default>, marginT3 margin(path3, pen)=<default>, bool above=<default>);
+void zaxis3(picture pic=<default>, Label L=<default>, void axis(picture, axisT)=<default>, real zmin=<default>, real zmax=<default>, pen p=<default>, void ticks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>)=<default>, bool arrow(picture, path3, material, marginT3(path3, pen), light, light)=<default>, marginT3 margin(path3, pen)=<default>, bool above=<default>);
+void XZZero(picture, axisT)(triple align=<default>, bool extend=<default>);
+void XZZero(picture, axisT);
+void YZZero(picture, axisT)(triple align=<default>, bool extend=<default>);
+void YZZero(picture, axisT);
+surface surface(picture pic=<default>, triple[][] f, bool[][] cond=<default>);
+surface surface(picture pic=<default>, real[][] f, real[] x, real[] y, real[] xsplinetype(real[], real[])=<default>, real[] ysplinetype(real[], real[])=<default>, bool[][] cond=<default>);
+surface surface(picture pic=<default>, real[][] f, pair a, pair b, real[] xsplinetype(real[], real[]), real[] ysplinetype(real[], real[])=<default>, bool[][] cond=<default>);
+surface surface(picture pic=<default>, real[][] f, pair a, pair b, bool[][] cond=<default>);
+surface surface(picture pic=<default>, triple f(pair z), pair a, pair b, int nu=<default>, int nv=<default>, bool cond(pair z)=<default>);
+surface surface(picture pic=<default>, triple f(pair z), real[] u, real[] v, real[](real[], real[])[] usplinetype, real[](real[], real[])[] vsplinetype=<default>, bool cond(pair z)=<default>);
+surface surface(picture pic=<default>, triple f(pair z), pair a, pair b, int nu=<default>, int nv=<default>, real[](real[], real[])[] usplinetype, real[](real[], real[])[] vsplinetype=<default>, bool cond(pair z)=<default>);
+surface surface(picture pic=<default>, real f(pair z), pair a, pair b, int nx=<default>, int ny=<default>, bool cond(pair z)=<default>);
+surface surface(picture pic=<default>, real f(pair z), pair a, pair b, int nx=<default>, int ny=<default>, real[] xsplinetype(real[], real[]), real[] ysplinetype(real[], real[])=<default>, bool cond(pair z)=<default>);
+void XYEquals(picture, axisT)(real x, real y, triple align=<default>, bool extend=<default>);
+triple Dir(real)(triple dir);
+void draw(picture pic=<default>, Label[] L=<default>, void(flatguide3)[][] g, pen[] p, light light=<default>, string name=<default>, render render=<default>, interaction interaction=<default>);
+void draw(picture pic=<default>, Label[] L=<default>, void(flatguide3)[][] g, pen p=<default>, light light=<default>, string name=<default>, render render=<default>, interaction interaction=<default>);
+void Ticks3(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>)(int sign, Label F=<default>, string ticklabel(real)=<default>, bool beginlabel=<default>, bool endlabel=<default>, real[] Ticks=<default>, real[] ticks=<default>, int N=<default>, bool begin=<default>, bool end=<default>, real Size=<default>, real size=<default>, bool extend=<default>, pen pTick=<default>, pen ptick=<default>);
+void Ticks3(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>)(int sign, Label F=<default>, string ticklabel(real)=<default>, bool beginlabel=<default>, bool endlabel=<default>, int N, int n=<default>, real Step=<default>, real step=<default>, bool begin=<default>, bool end=<default>, tickvalues modify(tickvalues)=<default>, real Size=<default>, real size=<default>, bool extend=<default>, pen pTick=<default>, pen ptick=<default>);
+real maxlength(triple f(pair z), pair a, pair b, int nu, int nv);
+void drawtick(picture pic, real[][] T, path3 g, path3 g2, ticklocate locate, real val, real Size, int sign, pen p, bool extend);
+triple tickMin3(picture pic);
+triple tickMax3(picture pic);
+triple Scale(picture pic=<default>, triple v);
+triple[][] Scale(picture pic=<default>, triple[][] P);
+real ScaleX(picture pic=<default>, real x);
+real ScaleY(picture pic=<default>, real y);
+real ScaleZ(picture pic=<default>, real z);
+real[][] ScaleZ(picture pic=<default>, real[][] P);
+picture vectorfield(path3 vector(pair v), triple f(pair z), pair a, pair b, int nu=<default>, int nv=<default>, bool truesize=<default>, real maxlength=<default>, bool cond(pair z)=<default>, pen p=<default>, bool arrow(picture, path3, material, marginT3(path3, pen), light, light)=<default>, marginT3 margin(path3, pen)=<default>, string name=<default>, render render=<default>);
+path3 Circle(triple c, real r, triple normal=<default>, int n=<default>);
+void InTicks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>)(Label format=<default>, string ticklabel(real)=<default>, bool beginlabel=<default>, bool endlabel=<default>, int N=<default>, int n=<default>, real Step=<default>, real step=<default>, bool begin=<default>, bool end=<default>, tickvalues modify(tickvalues)=<default>, real Size=<default>, real size=<default>, bool extend=<default>, pen pTick=<default>, pen ptick=<default>);
+void InTicks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>)(Label format=<default>, string ticklabel(real)=<default>, bool beginlabel=<default>, bool endlabel=<default>, real[] Ticks, real[] ticks=<default>, real Size=<default>, real size=<default>, bool extend=<default>, pen pTick=<default>, pen ptick=<default>);
+void InTicks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>);
+void Spline(flatguide3)(... void(flatguide3)[]);
+void InOutTicks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>)(Label format=<default>, string ticklabel(real)=<default>, bool beginlabel=<default>, bool endlabel=<default>, int N=<default>, int n=<default>, real Step=<default>, real step=<default>, bool begin=<default>, bool end=<default>, tickvalues modify(tickvalues)=<default>, real Size=<default>, real size=<default>, bool extend=<default>, pen pTick=<default>, pen ptick=<default>);
+void InOutTicks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>)(Label format=<default>, string ticklabel(real)=<default>, bool beginlabel=<default>, bool endlabel=<default>, real[] Ticks, real[] ticks=<default>, real Size=<default>, real size=<default>, bool extend=<default>, pen pTick=<default>, pen ptick=<default>);
+void InOutTicks(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>);
+void axes3(picture pic=<default>, Label xlabel=<default>, Label ylabel=<default>, Label zlabel=<default>, bool extend=<default>, triple min=<default>, triple max=<default>, pen p=<default>, bool arrow(picture, path3, material, marginT3(path3, pen), light, light)=<default>, marginT3 margin(path3, pen)=<default>);
+void label(picture pic, Label L, triple v, real x, align align, string format, pen p);
+void labelx(picture pic=<default>, Label L=<default>, triple v, align align=<default>, string format=<default>, pen p=<default>);
+void labely(picture pic=<default>, Label L=<default>, triple v, align align=<default>, string format=<default>, pen p=<default>);
+void labeltick(picture pic, real[][] T, path3 g, ticklocate locate, real val, int sign, real Size, string ticklabel(real), Label F, real norm=<default>);
+void labelaxis(picture pic, real[][] T, Label L, path3 g, ticklocate locate=<default>, int sign=<default>, bool ticklabels=<default>);
+void labelx3(picture pic=<default>, Label L=<default>, real x, align align=<default>, string format=<default>, pen p=<default>);
+void labely3(picture pic=<default>, Label L=<default>, real y, align align=<default>, string format=<default>, pen p=<default>);
+void labelz(picture pic=<default>, Label L=<default>, triple v, align align=<default>, string format=<default>, pen p=<default>);
+void labelz3(picture pic=<default>, Label L=<default>, real z, align align=<default>, string format=<default>, pen p=<default>);
+void autoscale3(picture pic=<default>, void axis(picture, axisT));
+void xtick(picture pic=<default>, triple v, triple dir=<default>, real size=<default>, pen p=<default>);
+void xtick(picture pic=<default>, Label L, triple v, triple dir=<default>, string format=<default>, real size=<default>, pen p=<default>);
+void ytick(picture pic=<default>, triple v, triple dir=<default>, real size=<default>, pen p=<default>);
+void ytick(picture pic=<default>, Label L, triple v, triple dir=<default>, string format=<default>, real size=<default>, pen p=<default>);
+void xtick3(picture pic=<default>, real x, triple dir=<default>, real size=<default>, pen p=<default>);
+void xtick3(picture pic=<default>, Label L, real x, triple dir=<default>, string format=<default>, real size=<default>, pen p=<default>);
+void ytick3(picture pic=<default>, real y, triple dir=<default>, real size=<default>, pen p=<default>);
+void ytick3(picture pic=<default>, Label L, real y, triple dir=<default>, string format=<default>, real size=<default>, pen p=<default>);
+void ztick(picture pic=<default>, triple v, triple dir=<default>, real size=<default>, pen p=<default>);
+void ztick(picture pic=<default>, Label L, triple v, triple dir=<default>, string format=<default>, real size=<default>, pen p=<default>);
+void ztick3(picture pic=<default>, real z, triple dir=<default>, real size=<default>, pen p=<default>);
+void ztick3(picture pic=<default>, Label L, real z, triple dir=<default>, string format=<default>, real size=<default>, pen p=<default>);
+triple defaultdir(triple X, triple Y, triple Z, bool opposite=<default>, projection P);
+real xtrans(real[][] t, real x);
+real ytrans(real[][] t, real y);
+real ztrans(real[][] t, real z);
+ticklocate ticklocate(real a, real b, autoscaleT S=<default>, real tickmin=<default>, real tickmax=<default>, real time(real)=<default>, triple dir(real));
+triple ticklabelshift(triple align, pen p=<default>);
+path3 Arc(triple c, triple v1, triple v2, triple normal=<default>, bool direction=<default>, int n=<default>);
+path3 Arc(triple c, real r, real theta1, real phi1, real theta2, real phi2, triple normal=<default>, bool direction, int n=<default>);
+path3 Arc(triple c, real r, real theta1, real phi1, real theta2, real phi2, triple normal=<default>, int n=<default>);
+void limits(picture pic=<default>, triple min, triple max);
+void XZEquals(picture, axisT)(real x, real z, triple align=<default>, bool extend=<default>);
+void YZEquals(picture, axisT)(real y, real z, triple align=<default>, bool extend=<default>);
+void XYZero(picture, axisT)(triple align=<default>, bool extend=<default>);
+void XYZero(picture, axisT);
+void zlimits(picture pic=<default>, real min=<default>, real max=<default>, bool crop=<default>);
+void tick(picture pic=<default>, triple v, triple dir, real size=<default>, pen p=<default>);
+void tick(picture pic=<default>, Label L, real value, triple v, triple dir, string format=<default>, real size=<default>, pen p=<default>);
+surface bispline(real[][] z, real[][] p, real[][] q, real[][] r, real[] x, real[] y, bool[][] cond=<default>);
+real[][][] bispline(real[][] f, real[] x, real[] y, real[] xsplinetype(real[], real[])=<default>, real[] ysplinetype(real[], real[])=<default>, bool[][] cond=<default>);
+real[][][] bispline0(real[][] z, real[][] p, real[][] q, real[][] r, real[] x, real[] y, bool[][] cond=<default>);
+real[] uniform(real T(real x), real Tinv(real x), real a, real b, int n);
+void NoTicks3(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>)();
+void NoTicks3(picture, real[][], Label, path3, path3, pen, bool(picture, path3, material, marginT3(path3, pen), light, light), marginT3(path3, pen), ticklocate, int[], bool opposite=<default>, bool primary=<default>);
bool Crop;
int ngraph;
real epsilon;
@@ -3226,8 +3152,8 @@ real axiscoverage;
real Ticksize;
bool NoCrop;
real ticksize;
-int nmesh;
int nCircle;
+int nmesh;
real ylabelwidth;
real axislabelfactor;
real[] clamped(real[], real[])(real slopea, real slopeb);
@@ -3253,9 +3179,9 @@ grid3(picture pic)[][] operator cast(grid3 gridroutine(picture pic));
triple X(picture pic);
triple Y(picture pic);
triple Z(picture pic);
-position middle;
grid3(picture pic)[] XYXgrid(position pos=<default>);
grid3(picture pic)[] XYXgrid;
+position middle;
grid3(picture pic)[] XY_XZgrid(position posa=<default>, position posb=<default>);
grid3(picture pic)[] XY_XZgrid;
grid3(picture pic)[] ZX_ZYgrid(position posa=<default>, position posb=<default>);
@@ -3291,28 +3217,28 @@ grid3(picture pic)[][] XYZgrid(position pos=<default>);
grid3(picture pic)[][] XYZgrid;
grid3(picture pic)[] ZYZgrid(position pos=<default>);
grid3(picture pic)[] ZYZgrid;
-grid3(picture pic)[] YZYgrid(position pos=<default>);
-grid3(picture pic)[] YZYgrid;
grid3 XZgrid(picture pic)(position pos=<default>);
grid3 XZgrid(picture pic);
grid3 YZgrid(picture pic)(position pos=<default>);
grid3 YZgrid(picture pic);
+grid3(picture pic)[] YZYgrid(position pos=<default>);
+grid3(picture pic)[] YZYgrid;
real fspline(real)(real[] x, real[] y, real[] splinetype(real[], real[])=<default>);
real pwhermite(real)(real[] x, real[] y, real[] dy);
horner diffdiv(real[] x, real[] y);
horner hdiffdiv(real[] x, real[] y, real[] dy);
horner operator init();
real fhorner(real)(horner sh);
-surface labelpath(string s, path3 p, real angle=<default>, triple optional=<default>);
-triple[] firstframe(path3 p, triple optional=<default>);
-triple[] nextframe(path3 p, real reltimestart, triple[] start, real reltimeend, int subdiv=<default>);
-real eps;
-triple nextnormal(triple p, triple q);
void labelpath(frame f, Label L, path g, string justify=<default>, pen p=<default>);
void labelpath(picture pic=<default>, Label L, path g, string justify=<default>, pen p=<default>);
string LeftJustified;
string Centered;
string RightJustified;
+surface labelpath(string s, path3 p, real angle=<default>, triple optional=<default>);
+triple[] firstframe(path3 p, triple optional=<default>);
+triple[] nextframe(path3 p, real reltimestart, triple[] start, real reltimeend, int subdiv=<default>);
+real eps;
+triple nextnormal(triple p, triple q);
string[] lm_infmsg;
void lm_qrfac(int m, int n, real[] a, bool pivot, int[] ipvt, real[] rdiag, real[] acnorm, real[] wa);
void lm_qrsolv(int n, real[] r, int ldr, int[] ipvt, real[] diag, real[] qtb, real[] x, real[] sdiag, real[] wa);
@@ -3342,7 +3268,6 @@ real LM_USERTOL;
real LM_DWARF;
void lm_print_quiet(int n_par, real[] par, int m_dat, real[] fvec, lm_data_type data, int iflag, int iter, int nfev);
void lm_print_default(int n_par, real[] par, int m_dat, real[] fvec, lm_data_type data, int iflag, int iter, int nfev);
-void mapTemplate(string name, string key, string value, string default);
real barmarksize(pen p=<default>);
real barmarksizefactor;
marker CrossIntervalMarker(int i=<default>, int n=<default>, real size=<default>, real space=<default>, real angle=<default>, pair offset=<default>, bool rotated=<default>, pen p=<default>, frame uniform=<default>, bool above=<default>);
@@ -3404,12 +3329,12 @@ real acot(real x);
pair[][] fft(pair[][] a, int sign=<default>);
real slope(path g, real x, int n=<default>, real fuzz=<default>);
real slope(path g, explicit pair z, int n=<default>, real fuzz=<default>);
-int[][] segmentlimits(bool[] b);
-int[][] segment(bool[] b);
picture grid(int Nx, int Ny, pen p=<default>);
rootfinder_settings operator init();
real frac(real x);
real asec(real x);
+int[][] segmentlimits(bool[] b);
+int[][] segment(bool[] b);
real time(path g, real x, int n=<default>, real fuzz=<default>);
real time(path g, explicit pair z, int n=<default>, real fuzz=<default>);
real[] leastsquares(real[][] A, real[] b, bool warn=<default>);
@@ -3434,11 +3359,11 @@ RKTableau E_Euler;
real error(real error, real initial, real lowOrder, real norm, real diff);
RKTableau RK5;
real stepfactor;
+solution integrate(real y, real c=<default>, real f(real t, real y), real a, real b=<default>, real h=<default>, int n=<default>, bool dynamic=<default>, real tolmin=<default>, real tolmax=<default>, real dtmin=<default>, real dtmax=<default>, RKTableau tableau, bool verbose=<default>);
+Solution integrate(real[] y, real[] f(real t, real[] y), real a, real b=<default>, real h=<default>, int n=<default>, bool dynamic=<default>, real tolmin=<default>, real tolmax=<default>, real dtmin=<default>, real dtmax=<default>, RKTableau tableau, bool verbose=<default>);
RKTableau RK4;
real[] newton(int iterations=<default>, real[] f(real[]), real[][] jacobian(real[]), real[] t);
real phi1(real x);
-solution integrate(real y, real c=<default>, real f(real t, real y), real a, real b=<default>, real h=<default>, int n=<default>, bool dynamic=<default>, real tolmin=<default>, real tolmax=<default>, real dtmin=<default>, real dtmax=<default>, RKTableau tableau, bool verbose=<default>);
-Solution integrate(real[] y, real[] f(real t, real[] y), real a, real b=<default>, real h=<default>, int n=<default>, bool dynamic=<default>, real tolmin=<default>, real tolmax=<default>, real dtmin=<default>, real dtmax=<default>, RKTableau tableau, bool verbose=<default>);
RKTableau RK3;
void expfactors(real x, coefficients a);
real phi2(real x);
@@ -3464,7 +3389,6 @@ real[] Coeff;
RKTableau PC;
RKTableau E_RK3BS;
pen[] Grayscale(int NColors=<default>);
-bounds Range(picture pic, real min, real max)(bool automin=<default>, real min=<default>, bool automax=<default>, real max=<default>);
pen[] Wheel(int NColors=<default>);
void image(frame f, real[][] data, pair initial, pair final, pen[] palette, bool transpose=<default>, transform t=<default>, bool copy=<default>, bool antialias=<default>);
void image(frame f, pen[][] data, pair initial, pair final, bool transpose=<default>, transform t=<default>, bool copy=<default>, bool antialias=<default>);
@@ -3486,6 +3410,7 @@ pen[] adjust(picture pic, real min, real max, real rmin, real rmax, pen[] palett
pen[] Gradient(int NColors=<default> ... pen[] p);
pen[] quantize(pen[] Palette, int n);
void NoTicks(frame, transform, Label, pair, path, path, pen, bool(picture, path, pen, marginT(path, pen)), marginT(path, pen), ticklocate, int[], bool opposite=<default>)(int sign=<default>);
+bounds Range(picture pic, real min, real max)(bool automin=<default>, real min=<default>, bool automax=<default>, real max=<default>);
bounds Full(picture pic, real min, real max);
void PaletteTicks(frame, transform, Label, pair, path, path, pen, bool(picture, path, pen, marginT(path, pen)), marginT(path, pen), ticklocate, int[], bool opposite=<default>)(int sign=<default>)(Label format=<default>, string ticklabel(real)=<default>, bool beginlabel=<default>, bool endlabel=<default>, int N=<default>, int n=<default>, real Step=<default>, real step=<default>, pen pTick=<default>, pen ptick=<default>);
void PaletteTicks(frame, transform, Label, pair, path, path, pen, bool(picture, path, pen, marginT(path, pen)), marginT(path, pen), ticklocate, int[], bool opposite=<default>)(int sign=<default>);
@@ -3555,13 +3480,14 @@ int[] artificialColumn;
void simplexWrite(rational[][] E, int[] Bindices, int, int);
path roundedpath(path A, real R, real S=<default>);
simplex operator init();
+void nextpage(pen p=<default>);
void display(frame[] f, real margin=<default>, pair align=<default>, pen p=<default>, pen figuremattpen=<default>, bool final=<default>);
void display(frame f, real margin=<default>, pair align=<default>, pen p=<default>, pen figuremattpen=<default>, bool final=<default>);
void display(string[] s, real margin=<default>, string[] captions=<default>, string caption=<default>, pair align=<default>, pen p=<default>, pen figuremattpen=<default>, bool final=<default>);
void display(string s, string caption=<default>, pair align=<default>, pen p=<default>, pen figuremattpen=<default>, bool final=<default>);
void multifigure(string[] slist, string options=<default>, string caption=<default>, pair align=<default>, pen p=<default>, pen figuremattpen=<default>, bool step=<default>);
+void filecode(bool center=<default>, string s, pen p=<default>, real indent=<default>, real skip=<default>, filltype filltype=<default>);
void subitem(string s, pen p=<default>);
-int page;
pen pagenumberpen;
pair pagenumberalign;
pair pagenumberposition;
@@ -3573,18 +3499,21 @@ void bibliography(string name);
void bibliographystyle(string name);
int[] lastnode;
real aboveequationskip;
-void nextpage(pen p=<default>);
void asyfigure(string s, string options=<default>, string caption=<default>, pair align=<default>, pen p=<default>, pen figuremattpen=<default>, filltype filltype=<default>, bool newslide=<default>);
void asyfilecode(bool center=<default>, string s, string options=<default>, string caption=<default>, pair align=<default>, pen p=<default>, pen figuremattpen=<default>, real indent=<default>, real skip=<default>, filltype filltype=<default>, bool newslide=<default>);
bool itemstep;
real itemskip;
void remark(bool center=<default>, string s, pair align=<default>, pen p=<default>, real indent=<default>, bool minipage=<default>, real skip=<default>, filltype filltype=<default>, bool step=<default>);
void usersetting();
-void filecode(bool center=<default>, string s, pen p=<default>, real indent=<default>, real skip=<default>, filltype filltype=<default>);
+void item(string s, pen p=<default>, bool step=<default>);
bool landscape;
+pen authorpen;
real codeskip;
+string cropcode(string s);
void newslide(bool stepping=<default>);
pen itempen;
+bool allowstepping;
+pair currentposition;
bool reverse;
void reversevideo();
void vbox(string s, pen p=<default>);
@@ -3593,7 +3522,6 @@ void exitfunction();
bool havepagenumber;
real pageheight;
real pagewidth;
-void item(string s, pen p=<default>, bool step=<default>);
picture background;
void background();
pen backgroundcolor;
@@ -3607,18 +3535,14 @@ pen titlepagepen;
void titlepage(string title, string author, string institution=<default>, string date=<default>, string url=<default>, bool newslide=<default>);
pair titlepageposition;
pen codepen;
-pen authorpen;
void erasestep(int erasenode);
bool checkposition();
void setpens(pen red=<default>, pen blue=<default>, pen steppen=<default>);
-string cropcode(string s);
void code(bool center=<default>, string s, pen p=<default>, real indent=<default>, real skip=<default>, filltype filltype=<default>);
transform tinv;
pair urlskip;
void numberpage(pen p=<default>);
pen urlpen;
-bool allowstepping;
-pair currentposition;
int[] firstnode;
bool firststep;
string asywrite(string s, string preamble=<default>);
@@ -3632,6 +3556,7 @@ void skip(real n=<default>);
bool stepping;
real pagemargin;
pen steppagenumberpen;
+int page;
bool empty();
void currentexitfunction();
void step();
@@ -3655,7 +3580,6 @@ path curve(pair c, real f(real, real), pair a, pair b);
path curve(pair c, real f(real), pair a, pair b);
picture slopefield(real f(real, real), pair a, pair b, int nx=<default>, int ny=<default>, real tickfactor=<default>, pen p=<default>);
picture slopefield(real f(real), pair a, pair b, int nx=<default>, int ny=<default>, pen p=<default>);
-real B03(real t);
patch[] maketriangle(path3 external, real f(triple), triple grad(triple), bool allowsubdivide=<default>);
real B23(real t);
path3 pathinface(positionedvector v1, positionedvector v2, triple facenorm, triple edge1normout, triple edge2normout);
@@ -3698,13 +3622,14 @@ surface implicitsurface(real f(triple)=<default>, real ff(real, real, real)=<def
bool operator ==(edge a, edge b);
patch[] triangletoquads(path3 external, real f(triple), triple grad(triple), triple a, triple b);
patch trianglewithnormals(path3 external, triple n1, triple n2, triple n3);
+int NULL_VERTEX;
evaluatedpoint[][][] make3dgrid(triple a, triple b, int nx, int ny, int nz, real f(triple), bool allowzero=<default>);
real B33(real t);
+real B03(real t);
evaluatedpoint[][] slice(evaluatedpoint[][] a, int start1, int end1, int start2, int end2);
evaluatedpoint[][][] slice(evaluatedpoint[][][] a, int start1, int end1, int start2, int end2, int start3, int end3);
positionedvector[][] slice(positionedvector[][] a, int start1, int end1, int start2, int end2);
positionedvector[][][] slice(positionedvector[][][] a, int start1, int end1, int start2, int end2, int start3, int end3);
-int NULL_VERTEX;
revolution operator *(real[][] t, revolution r);
skeleton operator init();
revolution operator init();
@@ -3724,46 +3649,45 @@ int[][] frequency(real[] x, real[] y, real[] xbins, real[] ybins);
int[][] frequency(real[] x, real[] y, pair a, pair b, int nx, int ny=<default>);
int[][] frequency(pair[] z, pair a, pair b, int nx, int ny=<default>);
real mean(real[] A);
-void histogram(picture pic=<default>, real[] bins, real[] count, real low=<default>, pen fillpen=<default>, pen drawpen=<default>, bool bars=<default>, Label legend=<default>, real markersize=<default>);
-void histogram(picture pic=<default>, real[] data, real a, real b, int n, bool normalize=<default>, real low=<default>, pen fillpen=<default>, pen drawpen=<default>, bool bars=<default>, Label legend=<default>, real markersize=<default>);
+real stdev(real[] A);
int bins(real[] data, int max=<default>);
path topbox(pair a, pair b);
path halfbox(pair a, pair b);
-real stdev(real[] A);
-real variance(real[] A);
-real legendmarkersize;
-real variancebiased(real[] A);
-linefit operator init();
real Gaussian(real x, real sigma);
real Gaussian(real x);
pair Gaussrandpair();
real Gaussrand();
+real variance(real[] A);
+real legendmarkersize;
+real variancebiased(real[] A);
+linefit operator init();
real skewness(real[] A);
linefit leastsquares(real[] x, real[] y);
linefit leastsquares(real[] x, real[] y, real[] w);
real kurtosis(real[] A);
real kurtosisexcess(real[] A);
-real hwratio;
-Relation r4a;
+void histogram(picture pic=<default>, real[] bins, real[] count, real low=<default>, pen fillpen=<default>, pen drawpen=<default>, bool bars=<default>, Label legend=<default>, real markersize=<default>);
+void histogram(picture pic=<default>, real[] data, real a, real b, int n, bool normalize=<default>, real low=<default>, pen fillpen=<default>, pen drawpen=<default>, bool bars=<default>, Label legend=<default>, real markersize=<default>);
pair[] endpoints(guide[] a);
Relation r3;
picture tableau(frame[] cards, bool number=<default>);
pair min(pair[] z);
Component bp;
+Braid apply(Relation r, Braid b, int step, int place);
Component phi;
real gapfactor;
Component bm;
-Braid apply(Relation r, Braid b, int step, int place);
+Component wye;
Relation operator -(Relation r);
Component operator init();
Braid operator init();
Relation operator init();
Syzygy operator init();
Relation r4b;
-Component wye;
+real hwratio;
+Relation r4a;
pair max(pair[] z);
pen Orchid;
-pen WildStrawberry;
pen Magenta;
pen BrickRed;
pen CadetBlue;
@@ -3772,8 +3696,9 @@ pen SpringGreen;
pen MidnightBlue;
pen OliveGreen;
pen Apricot;
-pen Salmon;
+pen Aquamarine;
pen Cyan;
+pen Lavender;
pen Red;
pen RawSienna;
pen Mahogany;
@@ -3788,10 +3713,11 @@ pen Goldenrod;
pen ForestGreen;
pen BurntOrange;
pen Tan;
-pen Aquamarine;
+pen YellowOrange;
+pen Maroon;
+pen YellowGreen;
pen Brown;
pen RubineRed;
-pen Lavender;
pen TealBlue;
pen White;
pen Purple;
@@ -3800,32 +3726,31 @@ pen Orange;
pen OrangeRed;
pen Fuchsia;
pen Peach;
+pen Sepia;
pen PineGreen;
pen Dandelion;
pen Black;
pen NavyBlue;
+pen VioletRed;
pen Rhodamine;
+pen Violet;
pen ProcessBlue;
-pen YellowOrange;
-pen Maroon;
-pen YellowGreen;
pen LimeGreen;
+pen Thistle;
pen Green;
pen GreenYellow;
+pen DarkOrchid;
pen Emerald;
-pen Sepia;
pen Mulberry;
pen RedViolet;
pen SkyBlue;
pen SeaGreen;
-pen VioletRed;
+pen WildStrawberry;
pen Periwinkle;
-pen Violet;
-pen Thistle;
pen Yellow;
pen JungleGreen;
+pen Salmon;
pen CornflowerBlue;
-pen DarkOrchid;
pen RoyalBlue;
pen Melon;
pen RoyalPurple;
@@ -3867,31 +3792,30 @@ v3dtypes operator init();
string VERSION;
pen Orchid;
pen Indigo;
+pen DeepSkyBlue;
pen Beige;
pen SlateBlue;
pen SlateGray;
pen Magenta;
-pen DarkOliveGreen;
-pen DarkOrange;
pen CadetBlue;
pen DeepPink;
+pen Cornsilk;
pen SpringGreen;
pen MidnightBlue;
pen Olive;
-pen Silver;
pen OliveDrab;
-pen Salmon;
+pen Aquamarine;
pen Chocolate;
+pen Seashell;
pen Cyan;
pen Gainsboro;
-pen Linen;
-pen SandyBrown;
pen Ivory;
+pen Lavender;
+pen GhostWhite;
pen PapayaWhip;
pen Red;
pen Pink;
pen MintCream;
-pen DeepSkyBlue;
pen DarkTurquoise;
pen Gray;
pen MediumBlue;
@@ -3907,28 +3831,30 @@ pen Plum;
pen Blue;
pen Gold;
pen BlueViolet;
+pen LavenderBlush;
pen Goldenrod;
pen ForestGreen;
-pen Cornsilk;
+pen Wheat;
pen Chartreuse;
pen NavajoWhite;
+pen PeachPuff;
pen Tan;
pen DarkMagenta;
pen AntiqueWhite;
+pen Maroon;
pen PaleTurquoise;
+pen YellowGreen;
pen IndianRed;
+pen Lime;
pen Crimson;
-pen Seashell;
-pen Aquamarine;
+pen SteelBlue;
pen Azure;
+pen LawnGreen;
pen Brown;
pen BurlyWood;
pen Moccasin;
pen DarkBlue;
-pen LawnGreen;
-pen Lavender;
pen Peru;
-pen GhostWhite;
pen White;
pen Purple;
pen WhiteSmoke;
@@ -3936,28 +3862,26 @@ pen DimGray;
pen Orange;
pen OrangeRed;
pen Fuchsia;
+pen LemonChiffon;
pen Bisque;
pen Honeydew;
pen RosyBrown;
pen Black;
-pen LavenderBlush;
+pen Aqua;
pen Khaki;
-pen Wheat;
pen FireBrick;
-pen PeachPuff;
+pen Violet;
pen Snow;
-pen Maroon;
-pen YellowGreen;
pen LimeGreen;
-pen Lime;
-pen SteelBlue;
+pen Thistle;
pen OldLace;
pen Green;
pen GreenYellow;
pen DarkCyan;
pen FloralWhite;
+pen Sienna;
pen DarkRed;
-pen LemonChiffon;
+pen DarkOrchid;
pen BlanchedAlmond;
pen PowderBlue;
pen DarkGray;
@@ -3966,39 +3890,40 @@ pen DarkGoldenrod;
pen SkyBlue;
pen SeaGreen;
pen DarkViolet;
-pen Aqua;
pen Teal;
pen AliceBlue;
-pen Violet;
pen HotPink;
+pen DarkOliveGreen;
+pen DarkOrange;
pen DodgerBlue;
pen SaddleBrown;
pen Tomato;
pen DarkKhaki;
-pen Thistle;
+pen Silver;
pen LightBlue;
pen LightCoral;
-pen Yellow;
pen LightCyan;
+pen Yellow;
+pen LightGreen;
pen PaleGreen;
pen LightGoldenrodYellow;
-pen LightGreen;
pen LightGrey;
-pen PaleGoldenrod;
pen LightPink;
+pen PaleGoldenrod;
pen LightSalmon;
pen LightSeaGreen;
pen LightSkyBlue;
+pen LightSlateGray;
pen Navy;
pen PaleVioletRed;
-pen Sienna;
+pen Salmon;
pen CornflowerBlue;
-pen LightSlateGray;
-pen DarkOrchid;
pen LightSteelBlue;
-pen rgbint(int r, int g, int b);
pen LightYellow;
+pen rgbint(int r, int g, int b);
+pen Linen;
pen Coral;
+pen SandyBrown;
pen MistyRose;
pen DarkSalmon;
pen DarkSeaGreen;
diff --git a/Build/source/utils/asymptote/asymptote.spec b/Build/source/utils/asymptote/asymptote.spec
index 1fa31e09f37..fbd2c4de65d 100644
--- a/Build/source/utils/asymptote/asymptote.spec
+++ b/Build/source/utils/asymptote/asymptote.spec
@@ -3,7 +3,7 @@
%global __python %{__python3}
Name: asymptote
-Version: 2.85
+Version: 2.87
Release: 1%{?dist}
Summary: Descriptive vector graphics language
diff --git a/Build/source/utils/asymptote/base/geometry.asy b/Build/source/utils/asymptote/base/geometry.asy
index 840cb960bed..bbc575898c9 100644
--- a/Build/source/utils/asymptote/base/geometry.asy
+++ b/Build/source/utils/asymptote/base/geometry.asy
@@ -6354,77 +6354,74 @@ void dot(picture pic = currentpicture, triangle t, pen p = currentpen)
// *=======================================================*
// *.......................INVERSIONS......................*
-/*<asyxml><function type="point" signature="inverse(real k,point,point)"><code></asyxml>*/
-point inverse(real k, point A, point M)
-{/*<asyxml></code><documentation>Return the inverse point of 'M' with respect to point A and inversion radius 'k'.</documentation></function></asyxml>*/
- return A + k/conj(M - A);
+/*<asyxml><struct signature="inversion"><code></asyxml>*/
+struct inversion
+{/*<asyxml></code><documentation>https://mathworld.wolfram.com/Inversion.html</documentation></asyxml>*/
+ point C;
+ real k;
+
+ /*<asyxml><function type="void" signature="init(point,real)"><code></asyxml>*/
+ void operator init(point C, real k)
+ {/*<asyxml></code><documentation>Return the inversion with respect to 'C' having circle power 'k'.</documentation></function></asyxml>*/
+ this.C = C;
+ this.k = k;
+ }
+ /*<asyxml><function type="void" signature="init(real,point)"><code></asyxml>*/
+ void operator init(real k, point C)
+ {/*<asyxml></code><documentation>Return the inversion with respect to 'C' having circle power 'k'.</documentation></function></asyxml>*/
+ this.C = C;
+ this.k = k;
+ }
+}/*<asyxml></struct></asyxml>*/
+
+/*<asyxml><function type="point" signature="inverse(inversion,point)"><code></asyxml>*/
+point inverse(inversion i, point P)
+{/*<asyxml></code><documentation>Return the inverse point of 'P' with respect to 'i'.</documentation></function></asyxml>*/
+ pair C = locate(i.C), P1 = locate(P);
+ pair P2 = C + i.k / conj(P1 - C);
+ return P2 / currentcoordsys;
}
/*<asyxml><function type="point" signature="radicalcenter(circle,circle)"><code></asyxml>*/
point radicalcenter(circle c1, circle c2)
-{/*<asyxml></code><documentation><url href = "http://fr.wikipedia.org/wiki/Puissance_d'un_point_par_rapport_%C3%A0_un_cercle"/></documentation></function></asyxml>*/
- point[] P = standardizecoordsys(c1.C, c2.C);
+{/*<asyxml></code><documentation><url href="http://fr.wikipedia.org/wiki/Puissance_d'un_point_par_rapport_%C3%A0_un_cercle"/></documentation></function></asyxml>*/
real k = c1.r^2 - c2.r^2;
- pair C1 = locate(c1.C);
- pair C2 = locate(c2.C);
- pair oop = C2 - C1;
- pair K = (abs(oop) == 0) ?
+ pair C1 = locate(c1.C), C2 = locate(c2.C);
+ pair D = C2 - C1;
+ pair K = C1 == C2 ?
(infinity, infinity) :
- midpoint(C1--C2) + 0.5 * k * oop/dot(oop, oop);
- return point(P[0].coordsys, K/P[0].coordsys);
+ 0.5 * (C1 + C2 + k * D / abs2(D));
+ return K / currentcoordsys;
}
/*<asyxml><function type="line" signature="radicalline(circle,circle)"><code></asyxml>*/
line radicalline(circle c1, circle c2)
-{/*<asyxml></code><documentation><url href = "http://fr.wikipedia.org/wiki/Puissance_d'un_point_par_rapport_%C3%A0_un_cercle"/></documentation></function></asyxml>*/
+{/*<asyxml></code><documentation><url href="http://fr.wikipedia.org/wiki/Puissance_d'un_point_par_rapport_%C3%A0_un_cercle"/></documentation></function></asyxml>*/
if (c1.C == c2.C) abort("radicalline: the centers must be distinct");
return perpendicular(radicalcenter(c1, c2), line(c1.C, c2.C));
}
/*<asyxml><function type="point" signature="radicalcenter(circle,circle,circle)"><code></asyxml>*/
point radicalcenter(circle c1, circle c2, circle c3)
-{/*<asyxml></code><documentation><url href = "http://fr.wikipedia.org/wiki/Puissance_d'un_point_par_rapport_%C3%A0_un_cercle"/></documentation></function></asyxml>*/
+{/*<asyxml></code><documentation><url href="http://fr.wikipedia.org/wiki/Puissance_d'un_point_par_rapport_%C3%A0_un_cercle"/></documentation></function></asyxml>*/
return intersectionpoint(radicalline(c1, c2), radicalline(c1, c3));
}
-/*<asyxml><struct signature="inversion"><code></asyxml>*/
-struct inversion
-{/*<asyxml></code><documentation>http://mathworld.wolfram.com/Inversion.html</documentation></asyxml>*/
- point C;
- real k;
-}/*<asyxml></struct></asyxml>*/
-
-/*<asyxml><function type="inversion" signature="inversion(real,point)"><code></asyxml>*/
-inversion inversion(real k, point C)
-{/*<asyxml></code><documentation>Return the inversion with respect to 'C' having inversion radius 'k'.</documentation></function></asyxml>*/
- inversion oi;
- oi.k = k;
- oi.C = C;
- return oi;
-}
-/*<asyxml><function type="inversion" signature="inversion(real,point)"><code></asyxml>*/
-inversion inversion(point C, real k)
-{/*<asyxml></code><documentation>Return the inversion with respect to 'C' having inversion radius 'k'.</documentation></function></asyxml>*/
- return inversion(k, C);
-}
-
/*<asyxml><function type="inversion" signature="inversion(circle,circle)"><code></asyxml>*/
inversion inversion(circle c1, circle c2, real sgn = 1)
{/*<asyxml></code><documentation>Return the inversion which transforms 'c1' to
- . 'c2' and positive inversion radius if 'sgn > 0';
- . 'c2' and negative inversion radius if 'sgn < 0';
- . 'c1' and 'c2' to 'c2' if 'sgn = 0'.</documentation></function></asyxml>*/
+ • 'c2' and positive inversion radius if 'sgn > 0';
+ • 'c2' and negative inversion radius if 'sgn < 0';
+ • 'c1' and 'c2' to 'c2' if 'sgn = 0'.</documentation></function></asyxml>*/
if(sgn == 0) {
point O = radicalcenter(c1, c2);
- return inversion(O^c1, O);
- }
- else {
- point C1 = c1.C, C2 = c2.C;
- real r1 = c1.r, r2 = sgn(sgn) * c2.r;
- return inversion(
- r1 * r2 * (1 - (length(C2 - C1) / (r1 + r2))^2),
- (r2 * C1 + r1 * C2) / (r1 + r2));
+ return inversion(O, O^c1);
}
+ pair C1 = locate(c1.C), C2 = locate(c2.C);
+ real r1 = c1.r, r2 = sgn(sgn) * c2.r;
+ pair O = (r2 * C1 + r1 * C2) / (r1 + r2);
+ real k = r1 * r2 * (1 - abs2(C2 - C1) / (r1 + r2)^2);
+ return inversion(O / currentcoordsys, k);
}
/*<asyxml><function type="inversion" signature="inversion(circle,circle,circle)"><code></asyxml>*/
@@ -6434,7 +6431,10 @@ inversion inversion(circle c1, circle c2, circle c3)
return inversion(Rc, Rc^c1);
}
-circle operator cast(inversion i){return circle(i.C, sgn(i.k) * sqrt(abs(i.k)));}
+circle operator cast(inversion i)
+{
+ return circle(i.C, sgn(i.k) * sqrt(abs(i.k)));
+}
/*<asyxml><function type="circle" signature="circle(inversion)"><code></asyxml>*/
circle circle(inversion i)
{/*<asyxml></code><documentation>Return the inversion circle of 'i'.</documentation></function></asyxml>*/
@@ -6443,7 +6443,7 @@ circle circle(inversion i)
inversion operator cast(circle c)
{
- return inversion(sgn(c.r) * c.r^2, c.C);
+ return inversion(c.C, sgn(c.r) * c.r^2);
}
/*<asyxml><function type="inversion" signature="inversion(circle)"><code></asyxml>*/
inversion inversion(circle c)
@@ -6451,10 +6451,10 @@ inversion inversion(circle c)
return c;
}
-/*<asyxml><operator type = "point" signature="*(inversion,point)"><code></asyxml>*/
+/*<asyxml><operator type="point" signature="*(inversion,point)"><code></asyxml>*/
point operator *(inversion i, point P)
{/*<asyxml></code><documentation>Provide inversion * point.</documentation></operator></asyxml>*/
- return inverse(i.k, i.C, P);
+ return inverse(i, P);
}
void lineinversion()
@@ -6463,48 +6463,47 @@ void lineinversion()
The returned circle has an infinite radius, circle.l has been set.");
}
-
-/*<asyxml><function type="circle" signature="inverse(real,point,line)"><code></asyxml>*/
-circle inverse(real k, point A, line l)
-{/*<asyxml></code><documentation>Return the inverse circle of 'l' with
- respect to point 'A' and inversion radius 'k'.</documentation></function></asyxml>*/
- if(A @ l) {
+/*<asyxml><function type="circle" signature="inverse(inversion,line)"><code></asyxml>*/
+circle inverse(inversion i, line l)
+{/*<asyxml></code><documentation>Return the inverse circle of 'l' with respect to 'i'.</documentation></function></asyxml>*/
+ if(i.C @ l) {
lineinversion();
- circle C = circle(A, infinity);
- C.l = l;
- return C;
+ circle c = circle(i.C, infinity);
+ c.l = l;
+ return c;
}
- point Ap = inverse(k, A, l.A), Bp = inverse(k, A, l.B);
- return circle(A, Ap, Bp);
+ point A = inverse(i, l.A), B = inverse(i, l.B);
+ return circle(i.C, A, B);
}
-/*<asyxml><operator type = "circle" signature="*(inversion,line)"><code></asyxml>*/
+/*<asyxml><operator type="circle" signature="*(inversion,line)"><code></asyxml>*/
circle operator *(inversion i, line l)
{/*<asyxml></code><documentation>Provide inversion * line for lines that don't pass through the inversion center.</documentation></operator></asyxml>*/
- return inverse(i.k, i.C, l);
+ return inverse(i, l);
}
-/*<asyxml><function type="circle" signature="inverse(real,point,circle)"><code></asyxml>*/
-circle inverse(real k, point A, circle c)
-{/*<asyxml></code><documentation>Return the inverse circle of 'c' with
- respect to point A and inversion radius 'k'.</documentation></function></asyxml>*/
- if(degenerate(c)) return inverse(k, A, c.l);
- if(A @ c) {
+/*<asyxml><function type="circle" signature="inverse(inversion,circle)"><code></asyxml>*/
+circle inverse(inversion i, circle c)
+{/*<asyxml></code><documentation>Return the inverse circle of 'c' with respect to 'i'.</documentation></function></asyxml>*/
+ if(degenerate(c)) return inverse(i, c.l);
+ if(i.C @ c) {
lineinversion();
- point M = rotate(180, c.C) * A, Mp = rotate(90, c.C) * A;
- circle oc = circle(A, infinity);
- oc.l = line(inverse(k, A, M), inverse(k, A, Mp));
- return oc;
+ point M1 = rotate(90, c.C) * i.C, M2 = rotate(-90, c.C) * i.C;
+ circle c1 = circle(i.C, infinity);
+ c1.l = line(inverse(i, M1), inverse(i, M2));
+ return c1;
}
- point[] P = standardizecoordsys(A, c.C);
- real s = k/((P[1].x - P[0].x)^2 + (P[1].y - P[0].y)^2 - c.r^2);
- return circle(P[0] + s * (P[1]-P[0]), abs(s) * c.r);
+ pair C1 = locate(i.C), C2 = locate(c.C);
+ pair D = C2 - C1;
+ real s = i.k / (abs2(D) - c.r^2);
+ pair C3 = C1 + s * D;
+ return circle((point)(C3 / currentcoordsys), abs(s) * c.r);
}
-/*<asyxml><operator type = "circle" signature="*(inversion,circle)"><code></asyxml>*/
+/*<asyxml><operator type="circle" signature="*(inversion,circle)"><code></asyxml>*/
circle operator *(inversion i, circle c)
{/*<asyxml></code><documentation>Provide inversion * circle.</documentation></operator></asyxml>*/
- return inverse(i.k, i.C, c);
+ return inverse(i, c);
}
// *.......................INVERSIONS......................*
// *=======================================================*
@@ -7151,20 +7150,20 @@ arc arc(explicit arc a, point M, point N)
return arc(a, relabscissa(a, M), relabscissa(a, N));
}
-/*<asyxml><function type="arc" signature="inverse(real,point,segment)"><code></asyxml>*/
-arc inverse(real k, point A, segment s)
+/*<asyxml><function type="arc" signature="inverse(inversion,segment)"><code></asyxml>*/
+arc inverse(inversion i, segment s)
{/*<asyxml></code><documentation>Return the inverse arc circle of 's'
- with respect to point A and inversion radius 'k'.</documentation></function></asyxml>*/
- point Ap = inverse(k, A, s.A), Bp = inverse(k, A, s.B),
- M = inverse(k, A, midpoint(s));
+ with respect to inversion 'i'.</documentation></function></asyxml>*/
+ point Ap = inverse(i, s.A), Bp = inverse(i, s.B),
+ M = inverse(i, midpoint(s));
return arccircle(Ap, M, Bp);
}
-/*<asyxml><operator type = "arc" signature="*(inversion,segment)"><code></asyxml>*/
+/*<asyxml><operator type="arc" signature="*(inversion,segment)"><code></asyxml>*/
arc operator *(inversion i, segment s)
{/*<asyxml></code><documentation>Provide
inversion * segment.</documentation></operator></asyxml>*/
- return inverse(i.k, i.C, s);
+ return inverse(i, s);
}
/*<asyxml><operator type = "path" signature="*(inversion,triangle)"><code></asyxml>*/
diff --git a/Build/source/utils/asymptote/base/graph3.asy b/Build/source/utils/asymptote/base/graph3.asy
index f17b4e97074..b9b872f4511 100644
--- a/Build/source/utils/asymptote/base/graph3.asy
+++ b/Build/source/utils/asymptote/base/graph3.asy
@@ -1880,6 +1880,27 @@ surface surface(picture pic=currentpicture, real[][] f, real[] x, real[] y,
splinetype ysplinetype=xsplinetype,
bool[][] cond={})
{
+ if(xsplinetype == linear && ysplinetype == linear) {
+ int nx=f.length-1;
+ int ny=nx > 0 ? f[0].length-1 : 0;
+
+ if(nx == 0 || ny == 0) return nullsurface;
+
+ bool all=cond.length == 0;
+
+ triple[][] v=new triple[nx+1][ny+1];
+
+ for(int i=0; i <= nx; ++i) {
+ bool[] condi=all ? null : cond[i];
+ real xi=x[i];
+ real[] fi=f[i];
+ triple[] vi=v[i];
+ for(int j=0; j <= ny; ++j)
+ vi[j]=(xi,y[j],fi[j]);
+ }
+ return surface(pic,v,cond);
+ }
+
real[][] f=ScaleZ(pic,f);
real[] x=map(pic.scale.x.T,x);
real[] y=map(pic.scale.y.T,y);
diff --git a/Build/source/utils/asymptote/base/mapArray.asy b/Build/source/utils/asymptote/base/mapArray.asy
new file mode 100644
index 00000000000..5a499b8c680
--- /dev/null
+++ b/Build/source/utils/asymptote/base/mapArray.asy
@@ -0,0 +1,9 @@
+typedef import(Src, Dst);
+
+private typedef Dst MapType(Src);
+
+Dst[] map(MapType f, Src[] a) {
+ return sequence(
+ new Dst(int i) {return f(a[i]);},
+ a.length);
+} \ No newline at end of file
diff --git a/Build/source/utils/asymptote/base/plain.asy b/Build/source/utils/asymptote/base/plain.asy
index 084fedd7581..4d555e6e667 100644
--- a/Build/source/utils/asymptote/base/plain.asy
+++ b/Build/source/utils/asymptote/base/plain.asy
@@ -188,17 +188,20 @@ void eval(code s, bool embedded=false)
if(!embedded) restoredefaults();
}
-// Associate a parametrized type with a name.
-void type(string type, string name)
+string mapArrayString(string From, string To)
{
- eval("typedef "+type+" "+name,true);
+ return "typedef "+From+" From;
+ typedef "+To+" To;
+ To[] map(To f(From), From[] a) {
+ return sequence(new To(int i) {return f(a[i]);},a.length);
+ }";
}
+// This function is deprecated: use
+// from mapArray(Src=T1, Dst=T2) access map;
void mapArray(string From, string To)
{
- type(From,"From");
- type(To,"To");
- eval("To[] map(To f(From), From[] a) {return sequence(new To(int i) {return f(a[i]);},a.length);}",true);
+ eval(mapArrayString(From,To),true);
}
// Evaluate user command line option.
@@ -267,8 +270,8 @@ cputime cputime()
real[] a=_cputime();
cputime cputime;
real clock=a[4];
- cputime.parent.user=a[0];
- cputime.parent.system=a[1];
+ cputime.parent.user=a[0]; // Includes system time
+ cputime.parent.system=0;
cputime.parent.clock=clock;
cputime.child.user=a[2];
cputime.child.system=a[3];
diff --git a/Build/source/utils/asymptote/base/plain_shipout.asy b/Build/source/utils/asymptote/base/plain_shipout.asy
index fcc7f8e28a6..a001ce045cc 100644
--- a/Build/source/utils/asymptote/base/plain_shipout.asy
+++ b/Build/source/utils/asymptote/base/plain_shipout.asy
@@ -7,8 +7,8 @@ if(settings.xasy)
string[] file3;
-string outprefix(string prefix=defaultfilename) {
- return stripextension(prefix != "" ? prefix : outname());
+string outprefix(string prefix=stripextension(defaultfilename)) {
+ return prefix != "" ? prefix : outname();
}
string outformat(string format="")
@@ -33,7 +33,7 @@ string Embed(string name, string text="", string options="", real width=0,
real height=0);
bool primitive() { // Encode primitive objects
- return settings.outformat == "html" || settings.outformat=="v3d";
+ return settings.outformat == "html" || settings.outformat=="v3d" || settings.v3d;
}
bool prconly(string format="")
@@ -125,7 +125,7 @@ void shipout(string prefix=defaultfilename, picture pic=currentpicture,
pic.uptodate=true;
if(!uptodate()) {
bool inlinetex=settings.inlinetex;
- bool prc=prc(format);
+ bool prc=prc(format) || settings.v3d;
bool empty3=pic.empty3();
if(prc && !empty3) {
if(settings.render == 0) {
diff --git a/Build/source/utils/asymptote/base/shaders/fragment.glsl b/Build/source/utils/asymptote/base/shaders/fragment.glsl
index 6f42f7d4919..0d165855115 100644
--- a/Build/source/utils/asymptote/base/shaders/fragment.glsl
+++ b/Build/source/utils/asymptote/base/shaders/fragment.glsl
@@ -220,7 +220,7 @@ void main()
#endif
}
#else
- m=Materials[int(materialIndex)];
+ m=Materials[materialIndex];
emissive=m.emissive;
#ifdef COLOR
diffuse=Color;
diff --git a/Build/source/utils/asymptote/base/three.asy b/Build/source/utils/asymptote/base/three.asy
index 9dfad6ce798..cde32f6acb0 100644
--- a/Build/source/utils/asymptote/base/three.asy
+++ b/Build/source/utils/asymptote/base/three.asy
@@ -1,7 +1,12 @@
private import math;
-if(prc0()) {
- if(!latex()) settings.prc=false;
+if(settings.v3d) settings.prc=false;
+
+if(prc0() || settings.v3d) {
+ if(!latex()) {
+ settings.prc=false;
+ settings.v3d=false;
+ }
else {
access embed;
Embed=embed.embedplayer;
@@ -2854,8 +2859,8 @@ object embed(string prefix=outprefix(), string label=prefix,
light Light=modelview*light;
if(prefix == "") prefix=outprefix();
- bool preview=settings.render > 0 && !prconly();
- if(prc) {
+ bool preview=settings.render > 0 && !prconly() && !settings.v3d;
+ if(prc || settings.v3d) {
// The media9.sty package cannot handle spaces or dots in filenames.
string dir=stripfile(prefix);
prefix=dir+replace(stripdirectory(prefix),
@@ -2864,7 +2869,7 @@ object embed(string prefix=outprefix(), string label=prefix,
prefix += "+"+(string) file3.length;
} else
preview=false;
- if(preview || (!prc && settings.render != 0)) {
+ if(preview || (!prc && settings.render != 0) || settings.v3d) {
frame f=S.f;
triple m,M;
real zcenter;
@@ -2891,7 +2896,7 @@ object embed(string prefix=outprefix(), string label=prefix,
} else if(M.z >= 0) abort("camera too close");
if(primitive())
- format=settings.outformat;
+ format=settings.v3d ? "v3d" : settings.outformat;
shipout3(prefix,f,preview ? nativeformat() : format,
S.width-defaultrender.margin,S.height-defaultrender.margin,
@@ -2900,6 +2905,12 @@ object embed(string prefix=outprefix(), string label=prefix,
tinv*inv*shift(0,0,zcenter),Light.background(),Light.position,
Light.diffuse,Light.specular,
view && !preview);
+ if(settings.v3d) {
+ string content=prefix+".v3d";
+ F.L=Embed(content,S.width,S.height);
+ if(!settings.inlinetex) file3.push(content);
+ return F;
+ }
if(!preview) return F;
}
@@ -2997,7 +3008,7 @@ frame embedder(object embedder(string prefix, string format),
string prefix, string format, bool view, light light)
{
frame f;
- bool prc=prc(format);
+ bool prc=prc(format) || settings.v3d;
if(!prc && settings.render != 0 && !view) {
static int previewcount=0;
bool keep=prefix != "";
diff --git a/Build/source/utils/asymptote/base/three_surface.asy b/Build/source/utils/asymptote/base/three_surface.asy
index 68f13c5782c..c54b0cc4901 100644
--- a/Build/source/utils/asymptote/base/three_surface.asy
+++ b/Build/source/utils/asymptote/base/three_surface.asy
@@ -742,7 +742,21 @@ path[] regularize(path p, bool checkboundary=true)
}
typedef void drawfcn(frame f, transform3 t=identity4, material[] m,
- light light=currentlight, render render=defaultrender);
+ light light=currentlight, render render=defaultrender);
+typedef bool primitivefcn(transform3 t);
+
+bool unscaled(transform3 t, triple v, triple w) {
+ return abs(length(t*v)-length(t*w)) < sqrtEpsilon;
+}
+
+struct primitive {
+ drawfcn draw;
+ primitivefcn valid;
+ void operator init(drawfcn draw, primitivefcn valid) {
+ this.draw=draw;
+ this.valid=valid;
+ }
+}
struct surface {
patch[] s;
@@ -750,7 +764,7 @@ struct surface {
bool vcyclic;
transform3 T=identity4;
- drawfcn draw;
+ primitive primitive=null;
bool PRCprimitive=true; // True unless no PRC primitive is available.
bool empty() {
@@ -1050,7 +1064,7 @@ surface operator * (transform3 t, surface s)
S.index=copy(s.index);
S.vcyclic=(bool) s.vcyclic;
S.T=t*s.T;
- S.draw=s.draw;
+ S.primitive=s.primitive;
S.PRCprimitive=s.PRCprimitive;
return S;
@@ -1564,7 +1578,8 @@ void draw(transform t=identity(), frame f, surface s, int nu=1, int nv=1,
bool is3D=is3D();
if(is3D) {
bool prc=prc();
- if(s.draw != null && (primitive() || (prc && s.PRCprimitive))) {
+ if(s.primitive != null && (primitive() || (prc && s.PRCprimitive)) &&
+ s.primitive.valid(shiftless(s.T))) {
bool noprerender=settings.prerender == 0;
for(int k=0; k < s.s.length; ++k) {
patch p=s.s[k];
@@ -1572,7 +1587,7 @@ void draw(transform t=identity(), frame f, surface s, int nu=1, int nv=1,
if(p.colors.length > 0) noprerender=false;
}
if(noprerender)
- s.draw(f,s.T,surfacepen,light,render);
+ s.primitive.draw(f,s.T,surfacepen,light,render);
} else {
bool group=name != "" || render.defaultnames;
if(group)
@@ -2144,24 +2159,27 @@ restricted surface unithemisphere=surface(octant1,t1*octant1,t2*octant1,
restricted surface unitsphere=surface(octant1,t1*octant1,t2*octant1,t3*octant1,
i*octant1,i*t1*octant1,i*t2*octant1,
i*t3*octant1);
-
-unitsphere.draw=
+unitsphere.primitive=primitive(
new void(frame f, transform3 t=identity4, material[] m,
light light=currentlight, render render=defaultrender)
{
material m=material(m[0],light);
drawSphere(f,t,half=false,m.p,m.opacity,m.shininess,m.metallic,m.fresnel0,
render.sphere);
- };
+ },new bool(transform3 t) {
+ return unscaled(t,X,Y) && unscaled(t,Y,Z);
+ });
-unithemisphere.draw=
+unithemisphere.primitive=primitive(
new void(frame f, transform3 t=identity4, material[] m,
light light=currentlight, render render=defaultrender)
{
material m=material(m[0],light);
drawSphere(f,t,half=true,m.p,m.opacity,m.shininess,m.metallic,m.fresnel0,
render.sphere);
- };
+ },new bool(transform3 t) {
+ return unscaled(t,X,Y) && unscaled(t,Y,Z);
+ });
restricted patch unitfrustum1(real ta, real tb)
{
@@ -2200,7 +2218,10 @@ drawfcn unitcylinderDraw(bool core) {
};
}
-unitcylinder.draw=unitcylinderDraw(false);
+unitcylinder.primitive=primitive(unitcylinderDraw(false),
+ new bool(transform3 t) {
+ return unscaled(t,X,Y);
+ });
private patch unitplane=patch(new triple[] {O,X,X+Y,Y});
restricted surface unitcube=surface(reverse(unitplane),
@@ -2212,13 +2233,16 @@ restricted surface unitcube=surface(reverse(unitplane),
restricted surface unitplane=surface(unitplane);
restricted surface unitdisk=surface(unitcircle3);
-unitdisk.draw=
+unitdisk.primitive=primitive(
new void(frame f, transform3 t=identity4, material[] m,
light light=currentlight, render render=defaultrender)
{
material m=material(m[0],light);
drawDisk(f,t,m.p,m.opacity,m.shininess,m.metallic,m.fresnel0);
- };
+ },
+ new bool(transform3 t) {
+ return unscaled(t,X,Y);
+ });
void dot(frame f, triple v, material p=currentpen,
light light=nolight, string name="",
diff --git a/Build/source/utils/asymptote/base/three_tube.asy b/Build/source/utils/asymptote/base/three_tube.asy
index 5c22f4d29bb..87cba0ab9c2 100644
--- a/Build/source/utils/asymptote/base/three_tube.asy
+++ b/Build/source/utils/asymptote/base/three_tube.asy
@@ -136,7 +136,10 @@ surface tube(triple z0, triple c0, triple c1, triple z1, real w)
f(t3);
s.PRCprimitive=false;
- s.draw=drawTube(g,w,min(s),max(s));
+ s.primitive=primitive(drawTube(g,w,min(s),max(s)),
+ new bool(transform3 t) {
+ return unscaled(t,X,Y);
+ });
return s;
}
@@ -213,7 +216,10 @@ struct tube
transform3 t=shift(v)*align(unit(u))*scale(r,r,abs(u));
// Draw opaque surfaces with core for better small-scale rendering.
surface unittube=t*unitcylinder;
- unittube.draw=unitcylinderDraw(core=true);
+ unittube.primitive=primitive(unitcylinderDraw(core=true),
+ new bool(transform3 t) {
+ return unscaled(t,X,Y);
+ });
s.push(unittube);
} else
s.append(render(subpath(p,i,i+1),r));
diff --git a/Build/source/utils/asymptote/base/v3d.asy b/Build/source/utils/asymptote/base/v3d.asy
index 5bdd0627d5f..d62ec0b1106 100644
--- a/Build/source/utils/asymptote/base/v3d.asy
+++ b/Build/source/utils/asymptote/base/v3d.asy
@@ -321,7 +321,7 @@ struct v3dfile
int material=xdrfile;
surface s=shift(origin)*scale3(radius)*unitsphere;
- s.draw=unitsphere.draw;
+ s.primitive=unitsphere.primitive;
primitive(center,material,s);
}
@@ -336,7 +336,7 @@ struct v3dfile
real azimuth=xdrfile;
surface s=shift(origin)*Align(polar,azimuth)*scale3(radius)*unithemisphere;
- s.draw=unithemisphere.draw;
+ s.primitive=unithemisphere.primitive;
primitive(center,material,s);
}
@@ -351,7 +351,7 @@ struct v3dfile
real azimuth=xdrfile;
surface s=shift(origin)*Align(polar,azimuth)*scale3(radius)*unitdisk;
- s.draw=unitdisk.draw;
+ s.primitive=unitdisk.primitive;
primitive(center,material,s);
}
@@ -396,7 +396,7 @@ struct v3dfile
path3(center,material,T*(O--Z));
surface s=T*unitcylinder;
- s.draw=unitcylinder.draw;
+ s.primitive=unitcylinder.primitive;
primitive(center,material,s);
}
@@ -414,7 +414,10 @@ struct v3dfile
path3(center,material,g[0]..controls g[1] and g[2]..g[3]);
surface s=tube(g[0],g[1],g[2],g[3],width);
- s.draw=drawTube(g,width,info.b,info.B);
+ s.primitive=primitive(drawTube(g,width,info.b,info.B),
+ new bool(transform3 t) {
+ return unscaled(t,X,Y);
+ });
primitive(center,material,s);
}
diff --git a/Build/source/utils/asymptote/base/v3dheadertypes.asy b/Build/source/utils/asymptote/base/v3dheadertypes.asy
index 5a5cd8c99da..23c37a1f137 100644
--- a/Build/source/utils/asymptote/base/v3dheadertypes.asy
+++ b/Build/source/utils/asymptote/base/v3dheadertypes.asy
@@ -1,6 +1,6 @@
// Enum class for v3dheadertypes
// AUTO-GENERATED from v3dheadertypes.csv
-// Generated at 2023-02-09 04:54:07
+// Generated at 2024-02-27 00:38:18
struct v3dheadertypes
{
diff --git a/Build/source/utils/asymptote/base/v3dtypes.asy b/Build/source/utils/asymptote/base/v3dtypes.asy
index 85def476803..dd29beb212d 100644
--- a/Build/source/utils/asymptote/base/v3dtypes.asy
+++ b/Build/source/utils/asymptote/base/v3dtypes.asy
@@ -1,6 +1,6 @@
// Enum class for v3dtypes
// AUTO-GENERATED from v3dtypes.csv
-// Generated at 2023-02-09 04:54:07
+// Generated at 2024-02-27 00:38:18
struct v3dtypes
{
diff --git a/Build/source/utils/asymptote/build-scripts/HOWTO-MSWindows b/Build/source/utils/asymptote/build-scripts/HOWTO-MSWindows
index 296cc23dd1a..684a3888bff 100644
--- a/Build/source/utils/asymptote/build-scripts/HOWTO-MSWindows
+++ b/Build/source/utils/asymptote/build-scripts/HOWTO-MSWindows
@@ -19,8 +19,8 @@ gsl-devel:
make install
readline-devel:
-./configure --prefix=/usr --without-curses --disable-shared
-make install
+./configure --prefix=/usr --disable-shared
+make install LOCAL_CFLAGS=-DNEED_EXTERN_PC
fftw3-devel:
./configure --prefix=/usr --disable-shared
diff --git a/Build/source/utils/asymptote/build-scripts/build-asymptote b/Build/source/utils/asymptote/build-scripts/build-asymptote
index ad95a8e0d5a..a7c45136756 100755
--- a/Build/source/utils/asymptote/build-scripts/build-asymptote
+++ b/Build/source/utils/asymptote/build-scripts/build-asymptote
@@ -3,7 +3,7 @@
HOME=~bowman
SHARED=$HOME/shared/asy
-GCVERSION=8.2.0
+GCVERSION=8.2.4
ATOMICVERSION=7.6.12
GC=gc-$GCVERSION
@@ -34,7 +34,7 @@ wget https://github.com/ivmai/bdwgc/releases/download/v$GCVERSION/gc-$GCVERSION.
wget https://github.com/ivmai/libatomic_ops/releases/download/v$ATOMICVERSION/libatomic_ops-$ATOMICVERSION.tar.gz
cp /usr/local/src/$GC.tar.gz asymptote-$VERSION
cp /usr/local/src/libatomic_ops-$ATOMICVERSION.tar.gz asymptote-$VERSION
-chown -R root.root asymptote-$VERSION
+chown -R root:root asymptote-$VERSION
cd asymptote-$VERSION
find . -name ".[^.]*" -exec rm -rf {} \;
./autogen.sh
diff --git a/Build/source/utils/asymptote/camp.l b/Build/source/utils/asymptote/camp.l
index a98bbabf01d..b62de16f5c8 100644
--- a/Build/source/utils/asymptote/camp.l
+++ b/Build/source/utils/asymptote/camp.l
@@ -54,7 +54,7 @@ typedef size_t (*input_f) (char* bif, size_t max_size);
input_f yy_input = NULL;
-void setlexer(input_f input, string filename)
+void setlexer(input_f input, string filename)
{
YY_FLUSH_BUFFER;
yywrap();
@@ -74,7 +74,7 @@ position lexerPos()
p.init(fi, tokPos);
return p;
}
-
+
namespace {
position here()
@@ -87,7 +87,7 @@ void adjust()
tokPos = charPos;
charPos += yyleng;
yylval.pos = here();
-}
+}
void savesymbol(symbol name)
{
@@ -154,7 +154,7 @@ void setEOF(string message) {
eof=true;
eofMessage=message;
}
-
+
// Called by code outside of the lexer to see if a parse error was caused by
// running out of input.
bool lexerEOF()
@@ -225,14 +225,14 @@ EXTRAOPS <<|>>|$|$$|@|@@|~|<>
<texstring>{
\"/([ \t]|{ENDL})*[\"\'] {adjust(); BEGIN INITIAL;}
-\" {adjust();
+\" {adjust();
BEGIN INITIAL;
- getstring();
+ getstring();
return STRING; }
<<EOF>> {adjust();
setEOF("string not terminated");
BEGIN INITIAL;
- getstring();
+ getstring();
return GARBAGE;
}
{ENDL} {adjust(); newline(); append('\n'); continue; }
@@ -243,14 +243,14 @@ EXTRAOPS <<|>>|$|$$|@|@@|~|<>
<cstring>{
\'/([ \t]|{ENDL})*[\"\'] {adjust(); BEGIN INITIAL;}
-\' {adjust();
+\' {adjust();
BEGIN INITIAL;
- getstring();
+ getstring();
return STRING; }
<<EOF>> {adjust();
setEOF("string not terminated");
BEGIN INITIAL;
- getstring();
+ getstring();
return GARBAGE;
}
{ENDL} {adjust(); newline(); append('\n'); continue; }
@@ -266,32 +266,32 @@ EXTRAOPS <<|>>|$|$$|@|@@|~|<>
char x=(char)(yytext[1]-'0');
append(x);
continue;
- }
+ }
{ESC}[0-7][0-7] {adjust();
char x=(char)((yytext[1]-'0')*8+yytext[2]-'0');
append(x);
continue;
- }
+ }
{ESC}[0-3][0-7][0-7] {adjust();
char x=(char)((yytext[1]-'0')*64+(yytext[2]-'0')*8
+yytext[3]-'0');
append(x);
continue;
- }
+ }
{ESC}x[0-9,A-F] {adjust();
- char x=(char) (yytext[2] <= '9' ? yytext[2]-'0' :
+ char x=(char) (yytext[2] <= '9' ? yytext[2]-'0' :
10+yytext[2]-'A');
append(x);
continue;
- }
+ }
{ESC}x[0-9,A-F][0-9,A-F] {adjust();
- char x=(char) ((yytext[2] <= '9' ? yytext[2]-'0' :
+ char x=(char) ((yytext[2] <= '9' ? yytext[2]-'0' :
10+yytext[2]-'A')*16
- +(yytext[3] <= '9' ? yytext[3]-'0' :
+ +(yytext[3] <= '9' ? yytext[3]-'0' :
10+yytext[3]-'A'));
append(x);
continue;
- }
+ }
. {adjust(); append(*yytext); }
}
@@ -380,18 +380,18 @@ explicit {adjust(); return EXPLICIT; }
[0-9]+ try {
- adjust(); yylval.e= new intExp(here(), lexical::cast<Int>(yytext));
+ adjust(); yylval.e= new intExp(here(), lexical::cast<Int>(yytext));
} catch (lexical::bad_cast&) {
error();
em << "invalid integer";
- yylval.e= new intExp(here(), 0);
+ yylval.e= new intExp(here(), 0);
} return LIT;
([0-9]*\.[0-9]+)|([0-9]+\.[0-9]*)|([0-9]*\.*[0-9]+e[-+]*[0-9]+)|([0-9]+\.[0-9]*e[-+]*[0-9]+) try {
adjust(); yylval.e= new realExp(here(), lexical::cast<double>(yytext));
} catch (lexical::bad_cast&) {
error();
em << "invalid real";
- yylval.e= new realExp(here(), 0);
+ yylval.e= new realExp(here(), 0);
} return LIT;
true {
adjust(); yylval.e= new booleanExp(here(), true); return LIT; }
@@ -406,7 +406,7 @@ newframe {
operator {adjust(); BEGIN opname; }
<opname>{
-[ \t\r] {adjust(); continue;}
+[ \t\r] {adjust(); continue;}
{ENDL} {adjust(); newline(); continue;}
<<EOF>> {adjust();
setEOF("missing operator name");
@@ -430,7 +430,7 @@ operator {adjust(); BEGIN opname; }
{LETTER}({LETTER}|[0-9])* {
makesymbol();
- return ID; }
+ return ID; }
\/\* {adjust(); /*commentDepth = 1;*/ BEGIN lexcomment; }
\" {startstring(); BEGIN texstring; }
diff --git a/Build/source/utils/asymptote/camp.tab.cc b/Build/source/utils/asymptote/camp.tab.cc
index 1b2eda1ff8a..d6f4602701c 100644
--- a/Build/source/utils/asymptote/camp.tab.cc
+++ b/Build/source/utils/asymptote/camp.tab.cc
@@ -238,48 +238,52 @@ enum yysymbol_kind_t
YYSYMBOL_runnable = 81, /* runnable */
YYSYMBOL_modifiers = 82, /* modifiers */
YYSYMBOL_dec = 83, /* dec */
- YYSYMBOL_idpair = 84, /* idpair */
- YYSYMBOL_idpairlist = 85, /* idpairlist */
- YYSYMBOL_strid = 86, /* strid */
- YYSYMBOL_stridpair = 87, /* stridpair */
- YYSYMBOL_stridpairlist = 88, /* stridpairlist */
- YYSYMBOL_vardec = 89, /* vardec */
- YYSYMBOL_barevardec = 90, /* barevardec */
- YYSYMBOL_type = 91, /* type */
- YYSYMBOL_celltype = 92, /* celltype */
- YYSYMBOL_dims = 93, /* dims */
- YYSYMBOL_dimexps = 94, /* dimexps */
- YYSYMBOL_decidlist = 95, /* decidlist */
- YYSYMBOL_decid = 96, /* decid */
- YYSYMBOL_decidstart = 97, /* decidstart */
- YYSYMBOL_varinit = 98, /* varinit */
- YYSYMBOL_block = 99, /* block */
- YYSYMBOL_arrayinit = 100, /* arrayinit */
- YYSYMBOL_basearrayinit = 101, /* basearrayinit */
- YYSYMBOL_varinits = 102, /* varinits */
- YYSYMBOL_formals = 103, /* formals */
- YYSYMBOL_explicitornot = 104, /* explicitornot */
- YYSYMBOL_formal = 105, /* formal */
- YYSYMBOL_fundec = 106, /* fundec */
- YYSYMBOL_typedec = 107, /* typedec */
- YYSYMBOL_slice = 108, /* slice */
- YYSYMBOL_value = 109, /* value */
- YYSYMBOL_argument = 110, /* argument */
- YYSYMBOL_arglist = 111, /* arglist */
- YYSYMBOL_tuple = 112, /* tuple */
- YYSYMBOL_exp = 113, /* exp */
- YYSYMBOL_join = 114, /* join */
- YYSYMBOL_dir = 115, /* dir */
- YYSYMBOL_basicjoin = 116, /* basicjoin */
- YYSYMBOL_tension = 117, /* tension */
- YYSYMBOL_controls = 118, /* controls */
- YYSYMBOL_stm = 119, /* stm */
- YYSYMBOL_stmexp = 120, /* stmexp */
- YYSYMBOL_blockstm = 121, /* blockstm */
- YYSYMBOL_forinit = 122, /* forinit */
- YYSYMBOL_fortest = 123, /* fortest */
- YYSYMBOL_forupdate = 124, /* forupdate */
- YYSYMBOL_stmexplist = 125 /* stmexplist */
+ YYSYMBOL_decdec = 84, /* decdec */
+ YYSYMBOL_decdeclist = 85, /* decdeclist */
+ YYSYMBOL_typeparam = 86, /* typeparam */
+ YYSYMBOL_typeparamlist = 87, /* typeparamlist */
+ YYSYMBOL_idpair = 88, /* idpair */
+ YYSYMBOL_idpairlist = 89, /* idpairlist */
+ YYSYMBOL_strid = 90, /* strid */
+ YYSYMBOL_stridpair = 91, /* stridpair */
+ YYSYMBOL_stridpairlist = 92, /* stridpairlist */
+ YYSYMBOL_vardec = 93, /* vardec */
+ YYSYMBOL_barevardec = 94, /* barevardec */
+ YYSYMBOL_type = 95, /* type */
+ YYSYMBOL_celltype = 96, /* celltype */
+ YYSYMBOL_dims = 97, /* dims */
+ YYSYMBOL_dimexps = 98, /* dimexps */
+ YYSYMBOL_decidlist = 99, /* decidlist */
+ YYSYMBOL_decid = 100, /* decid */
+ YYSYMBOL_decidstart = 101, /* decidstart */
+ YYSYMBOL_varinit = 102, /* varinit */
+ YYSYMBOL_block = 103, /* block */
+ YYSYMBOL_arrayinit = 104, /* arrayinit */
+ YYSYMBOL_basearrayinit = 105, /* basearrayinit */
+ YYSYMBOL_varinits = 106, /* varinits */
+ YYSYMBOL_formals = 107, /* formals */
+ YYSYMBOL_explicitornot = 108, /* explicitornot */
+ YYSYMBOL_formal = 109, /* formal */
+ YYSYMBOL_fundec = 110, /* fundec */
+ YYSYMBOL_typedec = 111, /* typedec */
+ YYSYMBOL_slice = 112, /* slice */
+ YYSYMBOL_value = 113, /* value */
+ YYSYMBOL_argument = 114, /* argument */
+ YYSYMBOL_arglist = 115, /* arglist */
+ YYSYMBOL_tuple = 116, /* tuple */
+ YYSYMBOL_exp = 117, /* exp */
+ YYSYMBOL_join = 118, /* join */
+ YYSYMBOL_dir = 119, /* dir */
+ YYSYMBOL_basicjoin = 120, /* basicjoin */
+ YYSYMBOL_tension = 121, /* tension */
+ YYSYMBOL_controls = 122, /* controls */
+ YYSYMBOL_stm = 123, /* stm */
+ YYSYMBOL_stmexp = 124, /* stmexp */
+ YYSYMBOL_blockstm = 125, /* blockstm */
+ YYSYMBOL_forinit = 126, /* forinit */
+ YYSYMBOL_fortest = 127, /* fortest */
+ YYSYMBOL_forupdate = 128, /* forupdate */
+ YYSYMBOL_stmexplist = 129 /* stmexplist */
};
typedef enum yysymbol_kind_t yysymbol_kind_t;
@@ -607,16 +611,16 @@ union yyalloc
/* YYFINAL -- State number of the termination state. */
#define YYFINAL 3
/* YYLAST -- Last index in YYTABLE. */
-#define YYLAST 1979
+#define YYLAST 1994
/* YYNTOKENS -- Number of terminals. */
#define YYNTOKENS 76
/* YYNNTS -- Number of nonterminals. */
-#define YYNNTS 50
+#define YYNNTS 54
/* YYNRULES -- Number of rules. */
-#define YYNRULES 200
+#define YYNRULES 213
/* YYNSTATES -- Number of states. */
-#define YYNSTATES 376
+#define YYNSTATES 416
/* YYMAXUTOK -- Last valid token kind. */
#define YYMAXUTOK 312
@@ -671,27 +675,28 @@ static const yytype_int8 yytranslate[] =
/* YYRLINE[YYN] -- Source line where rule number YYN was defined. */
static const yytype_int16 yyrline[] =
{
- 0, 191, 191, 195, 196, 201, 202, 207, 208, 209,
- 214, 215, 216, 218, 223, 224, 225, 227, 232, 233,
- 234, 235, 237, 239, 241, 242, 244, 246, 248, 249,
- 254, 256, 260, 261, 266, 267, 272, 274, 278, 279,
- 284, 288, 292, 293, 297, 301, 302, 306, 307, 312,
- 313, 318, 319, 324, 325, 326, 328, 333, 334, 338,
- 343, 344, 346, 348, 353, 354, 355, 359, 361, 366,
- 367, 368, 370, 375, 376, 380, 382, 384, 387, 390,
- 396, 398, 403, 404, 408, 409, 410, 411, 415, 416,
- 418, 419, 421, 422, 425, 429, 430, 432, 434, 436,
- 440, 441, 445, 446, 448, 450, 456, 457, 461, 462,
- 463, 464, 466, 467, 469, 471, 473, 475, 476, 477,
- 478, 479, 480, 481, 482, 483, 484, 485, 486, 487,
- 488, 489, 490, 491, 492, 493, 494, 495, 496, 498,
- 500, 502, 504, 506, 508, 513, 515, 520, 522, 523,
- 524, 526, 532, 534, 537, 539, 540, 547, 548, 550,
- 553, 556, 562, 563, 564, 567, 573, 574, 576, 578,
- 579, 583, 585, 588, 591, 597, 598, 603, 604, 605,
- 606, 608, 610, 612, 614, 616, 618, 619, 620, 621,
- 625, 629, 633, 634, 635, 639, 640, 644, 645, 649,
- 650
+ 0, 195, 195, 199, 200, 205, 206, 211, 212, 213,
+ 218, 219, 220, 222, 227, 228, 229, 231, 236, 237,
+ 238, 239, 241, 243, 245, 246, 248, 250, 252, 253,
+ 257, 259, 264, 268, 270, 276, 282, 286, 290, 292,
+ 297, 301, 303, 308, 310, 314, 315, 320, 321, 326,
+ 328, 332, 333, 338, 342, 346, 347, 351, 355, 356,
+ 360, 361, 366, 367, 372, 373, 378, 379, 380, 382,
+ 387, 388, 392, 397, 398, 400, 402, 407, 408, 409,
+ 413, 415, 420, 421, 422, 424, 429, 430, 434, 436,
+ 438, 441, 444, 450, 452, 457, 458, 462, 463, 464,
+ 465, 469, 470, 472, 473, 475, 476, 479, 483, 484,
+ 486, 488, 490, 494, 495, 499, 500, 502, 504, 510,
+ 511, 515, 516, 517, 518, 520, 521, 523, 525, 527,
+ 529, 530, 531, 532, 533, 534, 535, 536, 537, 538,
+ 539, 540, 541, 542, 543, 544, 545, 546, 547, 548,
+ 549, 550, 552, 554, 556, 558, 560, 562, 567, 569,
+ 574, 576, 577, 578, 580, 586, 588, 591, 593, 594,
+ 601, 602, 604, 607, 610, 616, 617, 618, 621, 627,
+ 628, 630, 632, 633, 637, 639, 642, 645, 651, 652,
+ 657, 658, 659, 660, 662, 664, 666, 668, 670, 672,
+ 673, 674, 675, 679, 683, 687, 688, 689, 693, 694,
+ 698, 699, 703, 704
};
#endif
@@ -718,7 +723,8 @@ static const char *const yytname[] =
"CONTINUE", "RETURN_", "THIS", "EXPLICIT", "GARBAGE", "LIT", "STRING",
"PERM", "MODIFIER", "UNARY", "EXP_IN_PARENS_RULE", "$accept", "file",
"fileblock", "bareblock", "name", "runnable", "modifiers", "dec",
- "idpair", "idpairlist", "strid", "stridpair", "stridpairlist", "vardec",
+ "decdec", "decdeclist", "typeparam", "typeparamlist", "idpair",
+ "idpairlist", "strid", "stridpair", "stridpairlist", "vardec",
"barevardec", "type", "celltype", "dims", "dimexps", "decidlist",
"decid", "decidstart", "varinit", "block", "arrayinit", "basearrayinit",
"varinits", "formals", "explicitornot", "formal", "fundec", "typedec",
@@ -734,12 +740,12 @@ yysymbol_name (yysymbol_kind_t yysymbol)
}
#endif
-#define YYPACT_NINF (-285)
+#define YYPACT_NINF (-292)
#define yypact_value_is_default(Yyn) \
((Yyn) == YYPACT_NINF)
-#define YYTABLE_NINF (-45)
+#define YYTABLE_NINF (-58)
#define yytable_value_is_error(Yyn) \
0
@@ -748,44 +754,48 @@ yysymbol_name (yysymbol_kind_t yysymbol)
STATE-NUM. */
static const yytype_int16 yypact[] =
{
- -285, 41, 472, -285, -285, 873, 873, 873, 873, -285,
- 873, -285, 873, -285, 14, 20, 14, 16, 8, 23,
- 31, 20, 20, 26, 49, 614, 56, 86, 91, 687,
- -285, 141, -285, -285, -285, 18, -285, 543, -285, -285,
- 100, 53, -285, -285, -285, -285, 122, 1545, -285, 125,
- -285, 224, 148, 148, 148, 148, 1931, 330, 203, 60,
- 1146, 190, -285, 194, -285, 88, 0, 155, 161, 166,
- 168, -1, 169, -285, 180, 34, -285, 236, 207, 15,
- 873, 873, 193, 873, -285, -285, -285, 961, 148, 235,
- 254, 616, 212, -285, -285, -285, -285, -285, 35, 217,
- -285, 229, 685, 262, 741, 873, 79, -285, -285, 141,
- -285, 873, 873, 873, 873, 873, 873, 873, 873, 873,
- 873, 873, 873, 873, 873, 873, 873, 873, 873, 873,
- 873, 873, 761, 873, -285, 231, -285, 741, -285, -285,
- 141, 114, -285, 873, -285, 873, 270, 14, -285, -285,
- -285, -285, -285, 24, 39, 401, -285, 227, 134, -14,
- 797, 105, 234, 1272, 1312, 233, -285, 278, -285, 243,
- 237, -285, 249, -285, 893, -285, 107, 1545, -285, 873,
- -285, 245, 998, 247, -10, 212, 236, 817, -285, 118,
- -285, 248, 1035, 1545, 873, 853, 291, 292, 197, 1763,
- 1791, 1819, 1847, 1875, 1875, 1903, 1903, 1903, 1903, 1939,
- 258, 258, 148, 148, 148, 148, 148, 1931, 1545, 1508,
- 873, 1188, 197, 231, -285, -285, 873, 1545, 1545, -285,
- -285, 295, 252, -285, 136, 253, 162, -285, -3, 180,
- 239, -285, 149, 20, -285, 1072, 146, 94, -285, 797,
- 212, 614, 614, 873, 46, 873, 873, 873, -285, -285,
- 893, 893, 1545, -285, 873, -285, -285, 180, 157, -285,
- -285, -285, 1545, -285, -285, -285, 1580, 873, 1617, -285,
- -285, 873, 1432, -285, 873, -285, -285, 300, -285, 301,
- -285, -285, -285, -285, 186, -285, -285, 180, 239, 239,
- 305, -285, -285, -285, 817, -285, 4, 265, 180, 191,
- 1109, 251, -285, 1352, 873, 1545, 264, -285, 1545, -285,
- -285, 1545, -285, 180, 873, 1654, 873, 1727, -285, 1230,
- -285, -285, -285, -285, -285, -285, 27, 279, 273, -285,
- 817, 817, -285, 180, -285, 614, 267, 1392, 873, -285,
- 1691, 873, 1691, -285, 873, 282, 817, -285, 276, -285,
- -285, -285, -285, 614, 275, 237, 1691, 1470, 817, -285,
- -285, -285, 614, -285, -285, -285
+ -292, 43, 500, -292, -292, 881, 881, 881, 881, -292,
+ 881, -292, 881, -292, 20, 31, 15, 24, 17, 21,
+ 68, 11, 31, 50, 57, 176, 64, 143, 156, 282,
+ -292, 27, -292, -292, -292, 129, -292, 571, -292, -292,
+ 185, 165, -292, -292, -292, -292, 111, 1560, -292, 197,
+ -292, 175, 183, 183, 183, 183, 1946, 358, 222, 124,
+ 1161, 45, -292, 26, -292, 60, 132, 210, 34, 233,
+ 238, 245, -1, 4, 12, -292, 221, 268, -2, -292,
+ 293, 273, 202, 881, 881, 262, 881, -292, -292, -292,
+ 976, 183, 642, 316, 669, 281, -292, -292, -292, -292,
+ -292, 213, 283, -292, 297, 700, 329, 727, 881, 217,
+ -292, -292, 27, -292, 881, 881, 881, 881, 881, 881,
+ 881, 881, 881, 881, 881, 881, 881, 881, 881, 881,
+ 881, 881, 881, 881, 881, 770, 881, -292, 294, -292,
+ 727, -292, -292, 27, 160, -292, 881, -292, 881, 330,
+ 35, 20, -292, -292, 336, 35, -292, -292, -292, 131,
+ 35, 147, 429, -292, 336, 307, 216, 2, 784, 146,
+ 309, 1287, 1327, 315, -292, 353, -292, 310, 317, -292,
+ 325, -292, 908, -292, 144, 1560, -292, 881, -292, 320,
+ 1013, 321, 7, 281, 293, 827, -292, 151, -292, 322,
+ 1050, 1560, 881, 854, 359, 365, 348, 1778, 1806, 1834,
+ 1862, 1890, 1890, 1918, 1918, 1918, 1918, 1954, 314, 314,
+ 183, 183, 183, 183, 183, 1946, 1560, 1523, 881, 1203,
+ 348, 294, -292, -292, 881, 1560, 1560, -292, 347, -292,
+ 239, -292, 360, -292, -292, -292, 249, 254, 383, 344,
+ -292, 225, 258, 345, 231, -292, 270, 9, 221, 326,
+ -292, 166, 31, -292, 1087, 280, 16, -292, 784, 281,
+ 176, 176, 881, 120, 881, 881, 881, -292, -292, 908,
+ 908, 1560, -292, 881, -292, -292, 221, 177, -292, -292,
+ -292, 1560, -292, -292, -292, 1595, 881, 1632, -292, -292,
+ 881, 1447, -292, 881, -292, -292, 31, 18, 35, 349,
+ 336, 354, 392, -292, 393, -292, 351, -292, -292, 356,
+ -292, 187, -292, -292, 221, 326, 326, 402, -292, -292,
+ -292, 827, -292, 110, 362, 221, 208, 1124, 366, -292,
+ 1367, 881, 1560, 370, -292, 1560, -292, -292, 1560, -292,
+ 221, 881, 1669, 881, 1742, -292, 1245, -292, 424, -292,
+ -292, -292, -292, -292, -292, -292, 393, -292, -292, -292,
+ -292, -292, 139, 399, 394, -292, 827, 827, -292, 221,
+ -292, 176, 386, 1407, 881, -292, 1706, 881, 1706, -292,
+ 881, 390, 232, 405, 827, -292, 400, -292, -292, -292,
+ -292, 176, 397, 317, 1706, 1485, -292, -292, 827, -292,
+ -292, -292, 176, -292, -292, -292
};
/* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
@@ -794,63 +804,69 @@ static const yytype_int16 yypact[] =
static const yytype_uint8 yydefact[] =
{
3, 0, 2, 1, 7, 0, 0, 0, 0, 9,
- 0, 5, 0, 177, 0, 0, 0, 0, 0, 0,
+ 0, 5, 0, 190, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 99, 110, 111, 15, 14, 108, 4, 0, 10, 18,
- 0, 0, 42, 191, 19, 20, 109, 190, 11, 0,
- 178, 108, 153, 152, 115, 116, 117, 0, 108, 0,
- 0, 36, 35, 0, 38, 0, 0, 0, 0, 0,
- 7, 0, 0, 3, 0, 44, 83, 0, 44, 138,
- 0, 0, 0, 192, 186, 187, 188, 0, 112, 0,
- 0, 0, 43, 17, 16, 12, 13, 40, 53, 41,
- 49, 51, 0, 0, 0, 0, 166, 169, 157, 154,
- 170, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 112, 123, 124, 15, 14, 121, 4, 0, 10, 18,
+ 0, 0, 55, 204, 19, 20, 122, 203, 11, 0,
+ 191, 121, 166, 165, 128, 129, 130, 0, 121, 0,
+ 0, 47, 48, 0, 51, 0, 0, 0, 0, 0,
+ 0, 0, 7, 0, 0, 3, 0, 0, 57, 96,
+ 0, 57, 151, 0, 0, 0, 205, 199, 200, 201,
+ 0, 125, 0, 0, 0, 56, 17, 16, 12, 13,
+ 53, 66, 54, 62, 64, 0, 0, 0, 0, 179,
+ 182, 170, 167, 183, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 151, 158, 179, 0, 59, 6,
- 98, 0, 149, 0, 97, 0, 0, 0, 21, 24,
- 27, 28, 29, 0, 0, 0, 82, 0, 53, 74,
- 0, 141, 139, 0, 0, 0, 194, 0, 199, 0,
- 193, 189, 7, 93, 0, 102, 0, 100, 8, 84,
- 45, 0, 0, 0, 74, 54, 0, 0, 95, 0,
- 88, 0, 0, 155, 0, 0, 0, 0, 137, 132,
- 131, 135, 134, 129, 130, 125, 126, 127, 128, 133,
- 118, 119, 120, 121, 122, 123, 124, 136, 148, 0,
- 0, 0, 150, 159, 160, 113, 0, 107, 106, 37,
- 39, 30, 0, 32, 0, 0, 0, 156, 74, 0,
- 74, 73, 0, 0, 69, 0, 0, 74, 142, 0,
- 140, 0, 0, 0, 53, 195, 0, 0, 103, 94,
- 0, 0, 86, 91, 85, 89, 46, 55, 0, 50,
- 52, 58, 57, 96, 92, 90, 175, 0, 171, 167,
- 168, 0, 0, 163, 0, 161, 114, 0, 23, 0,
- 22, 26, 25, 55, 0, 143, 70, 0, 74, 74,
- 75, 47, 60, 64, 0, 67, 0, 65, 0, 0,
- 0, 180, 182, 0, 0, 196, 0, 200, 101, 104,
- 105, 87, 80, 56, 0, 173, 0, 147, 162, 0,
- 31, 33, 56, 145, 71, 72, 53, 76, 0, 62,
- 0, 66, 144, 0, 48, 0, 0, 0, 197, 81,
- 176, 0, 172, 164, 0, 78, 0, 61, 0, 68,
- 146, 181, 183, 0, 0, 198, 174, 0, 0, 77,
- 63, 185, 0, 165, 79, 184
+ 0, 0, 0, 0, 0, 0, 0, 164, 171, 192,
+ 0, 72, 6, 111, 0, 162, 0, 110, 0, 0,
+ 0, 0, 21, 24, 0, 0, 27, 28, 29, 0,
+ 0, 0, 0, 95, 0, 0, 66, 87, 0, 154,
+ 152, 0, 0, 0, 207, 0, 212, 0, 206, 202,
+ 7, 106, 0, 115, 0, 113, 8, 97, 58, 0,
+ 0, 0, 87, 67, 0, 0, 108, 0, 101, 0,
+ 0, 168, 0, 0, 0, 0, 150, 145, 144, 148,
+ 147, 142, 143, 138, 139, 140, 141, 146, 131, 132,
+ 133, 134, 135, 136, 137, 149, 161, 0, 0, 0,
+ 163, 172, 173, 126, 0, 120, 119, 50, 7, 38,
+ 0, 37, 0, 52, 40, 41, 0, 0, 43, 0,
+ 45, 0, 0, 0, 0, 169, 0, 87, 0, 87,
+ 86, 0, 0, 82, 0, 0, 87, 155, 0, 153,
+ 0, 0, 0, 66, 208, 0, 0, 116, 107, 0,
+ 0, 99, 104, 98, 102, 59, 68, 0, 63, 65,
+ 71, 70, 109, 105, 103, 188, 0, 184, 180, 181,
+ 0, 0, 176, 0, 174, 127, 0, 0, 0, 0,
+ 0, 0, 0, 23, 0, 22, 0, 26, 25, 0,
+ 68, 0, 156, 83, 0, 87, 87, 88, 60, 73,
+ 77, 0, 80, 0, 78, 0, 0, 0, 193, 195,
+ 0, 0, 209, 0, 213, 114, 117, 118, 100, 93,
+ 69, 0, 186, 0, 160, 175, 0, 36, 0, 33,
+ 39, 31, 42, 34, 44, 46, 0, 30, 69, 158,
+ 84, 85, 66, 89, 0, 75, 0, 79, 157, 0,
+ 61, 0, 0, 0, 210, 94, 189, 0, 185, 177,
+ 0, 0, 0, 91, 0, 74, 0, 81, 159, 194,
+ 196, 0, 0, 211, 187, 0, 32, 35, 0, 90,
+ 76, 198, 0, 178, 92, 197
};
/* YYPGOTO[NTERM-NUM]. */
static const yytype_int16 yypgoto[] =
{
- -285, -285, 250, -285, 10, 263, -285, 285, 36, 170,
- 309, -6, -285, 307, 246, -13, 308, -20, -285, -285,
- 145, -284, -210, 260, 171, -285, -285, -164, -285, -227,
- -285, -285, 238, -285, -165, 241, -285, -5, -285, -121,
- 205, -285, -285, -19, -79, -138, -285, -285, -285, -8
+ -292, -292, 367, -292, 10, 387, -292, 406, 137, 52,
+ 136, 284, 133, -153, 1, -3, -292, 428, 364, -6,
+ 430, -25, -292, -292, 257, -291, -230, 377, 287, -292,
+ -292, -183, -292, -186, -292, -292, 350, -292, -143, 355,
+ -292, -5, -292, -127, 327, -292, -292, -21, -80, -125,
+ -292, -292, -292, 75
};
/* YYDEFGOTO[NTERM-NUM]. */
static const yytype_int16 yydefgoto[] =
{
- 0, 1, 2, 57, 51, 36, 37, 38, 233, 234,
- 63, 64, 65, 39, 40, 41, 42, 185, 162, 99,
- 100, 101, 270, 43, 271, 306, 307, 242, 243, 244,
- 44, 45, 181, 46, 175, 176, 59, 47, 133, 134,
- 135, 196, 197, 48, 49, 50, 169, 316, 364, 170
+ 0, 1, 2, 57, 51, 36, 37, 38, 239, 240,
+ 245, 246, 250, 251, 63, 64, 65, 39, 40, 41,
+ 42, 193, 170, 102, 103, 104, 289, 43, 290, 333,
+ 334, 261, 262, 263, 44, 45, 189, 46, 183, 184,
+ 59, 47, 136, 137, 138, 204, 205, 48, 49, 50,
+ 177, 343, 402, 178
};
/* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM. If
@@ -858,476 +874,485 @@ static const yytype_int16 yydefgoto[] =
number is the opposite. If YYTABLE_NINF, syntax error. */
static const yytype_int16 yytable[] =
{
- 52, 53, 54, 55, 168, 56, 82, 60, 77, 258,
- 67, 70, 35, 296, 224, 92, 337, 61, 96, 68,
- 268, -44, 58, 4, 87, 66, 88, 231, 71, 239,
- 158, 75, 78, 267, 74, 240, 305, 9, 141, 240,
- 293, 3, 231, 90, 90, 339, 240, 35, 149, 9,
- 153, 232, 355, 340, 241, 92, 98, 159, 241, 161,
- 89, 160, 90, 73, 91, 241, 235, 35, 80, 238,
- 167, 334, 335, 157, 294, 163, 164, 184, 90, 62,
- 157, 157, 314, 309, 177, 62, 182, 69, 238, 194,
- 195, 81, 157, 35, 338, 319, 320, 177, 83, 192,
- 193, 295, 285, 142, 198, 143, 199, 200, 201, 202,
- 203, 204, 205, 206, 207, 208, 209, 210, 211, 212,
- 213, 214, 215, 216, 217, 218, 219, 221, 222, 322,
- 358, 359, 182, 147, 84, 225, 148, 308, 227, 85,
- 228, 230, 250, 240, 4, 246, 369, 247, 97, 4,
- 259, 183, 260, 5, 6, 245, 261, 226, 374, 333,
- 183, 273, 241, 260, 102, 35, 103, 261, 104, 177,
- 342, 7, 8, 136, 262, 9, 238, 317, 10, 128,
- 157, 289, 272, 12, 290, 349, 246, 302, 12, 276,
- 278, 303, 297, -34, 298, 304, 19, 146, 299, 22,
- 323, 19, 298, 150, 22, 360, 299, 289, 30, 151,
- 292, 31, 32, 30, 152, 282, 31, 32, -34, 154,
- 11, 286, 122, 123, 124, 125, 126, 127, 128, 332,
- 300, 298, 311, 312, 343, 299, 298, 132, 172, 158,
- 299, 272, 5, 6, 310, 89, 140, 90, 313, 91,
- 315, 90, 318, 75, 165, 177, 177, 178, 183, 321,
- 7, 8, 186, 187, 9, 190, 89, 10, 90, 168,
- 137, 132, 325, 229, 180, 253, 327, 12, 173, 329,
- 249, 254, 256, 257, 174, 124, 125, 126, 127, 128,
- 19, 255, 263, 22, 266, 274, 279, 280, 287, 272,
- 288, 291, 30, 330, 231, 31, 32, 241, 336, 347,
- 341, 345, 348, 356, 357, 362, 368, 370, 372, 350,
- 139, 352, 95, 155, 236, 331, 361, 72, 76, 166,
- 79, 269, 248, 4, 156, 272, 272, 5, 6, 223,
- 365, 0, 191, 189, 371, 0, 366, 0, 0, 367,
- 0, 272, 0, 375, 0, 7, 8, 0, 0, 9,
- 0, 0, 10, 272, 0, 0, 0, 0, 0, 0,
- 11, 138, 12, 0, 0, 0, 0, 0, 13, 0,
+ 52, 53, 54, 55, 85, 56, 176, 60, 254, 287,
+ 95, 232, 35, 69, 4, 80, 99, 68, 61, 74,
+ 72, 358, 58, 61, 90, 66, 91, 70, 73, 149,
+ 4, 78, 81, 144, 4, 332, 373, 149, 238, 277,
+ 9, -47, 93, 3, 165, 258, 9, 35, 93, -47,
+ 286, 259, 320, 95, 160, 159, 259, 169, 259, 335,
+ 9, 75, 161, 77, 9, 259, 359, 35, 150, 12,
+ 260, 76, 67, 323, 321, 260, 155, 260, 171, 172,
+ 175, 393, 19, 336, 260, 22, 62, 185, 62, 190,
+ -49, 62, 83, -49, 30, 71, 35, 31, 32, 84,
+ 185, 374, 200, 201, 304, 151, 86, 206, 152, 207,
+ 208, 209, 210, 211, 212, 213, 214, 215, 216, 217,
+ 218, 219, 220, 221, 222, 223, 224, 225, 226, 227,
+ 229, 230, -57, 322, 248, 190, 346, 347, 233, 370,
+ 371, 235, 166, 236, 241, 269, 396, 397, 243, 241,
+ 248, 375, 242, 105, 241, 106, 341, 107, 249, 376,
+ 78, 349, 257, 264, 409, 78, 165, 145, 101, 146,
+ 78, 92, 35, 93, 253, 94, 93, 185, 414, 4,
+ 153, 257, 281, 5, 6, 165, 265, 278, 266, 279,
+ 291, 87, 191, 280, 292, 344, 279, 295, 297, 369,
+ 280, 7, 8, 234, 88, 9, 191, 247, 10, 324,
+ 378, 325, 252, 392, 131, 326, 11, 92, 12, 93,
+ 350, 140, 325, 301, 13, 385, 326, 202, 203, 305,
+ 368, 19, 325, 100, 22, 23, 326, 24, 25, 26,
+ 27, 28, 29, 30, 167, 139, 31, 32, 168, 338,
+ 339, 379, 154, 325, 398, 192, 327, 326, 257, 165,
+ 291, 11, 165, 337, 92, 143, 93, 340, 94, 342,
+ 314, 345, 78, 315, 185, 185, 314, 314, 348, 318,
+ 407, 156, 307, 4, 308, 4, 157, 5, 6, 5,
+ 6, 352, 309, 158, 310, 354, 166, 311, 356, 308,
+ 357, 316, 241, 308, 176, 7, 8, 7, 8, 9,
+ 164, 9, 10, 319, 10, 310, 78, 93, 78, 186,
+ 265, 329, 12, 173, 12, 330, 291, 191, 194, 331,
+ 89, 195, 198, 237, 135, 19, 383, 19, 22, 244,
+ 22, 127, 128, 129, 130, 131, 386, 30, 388, 30,
+ 31, 32, 31, 32, 188, 268, 273, 272, 274, 276,
+ 399, 4, 275, 149, 298, 5, 6, 282, 285, 293,
+ 299, 291, 291, 125, 126, 127, 128, 129, 130, 131,
+ 411, 306, 404, 7, 8, 405, 312, 9, 135, 291,
+ 10, 415, 313, 317, 260, 364, 248, 361, 11, 141,
+ 12, 366, 363, 291, 367, 372, 13, 377, 14, 15,
+ 16, 17, 18, 19, 20, 21, 22, 23, 384, 24,
+ 25, 26, 27, 28, 29, 30, 381, 391, 31, 32,
+ 33, 34, 4, 394, 400, 395, 5, 6, 406, 408,
+ 412, 410, 162, 98, 142, 360, 362, 365, 256, 79,
+ 174, 288, 82, 163, 7, 8, 267, 199, 9, 403,
+ 197, 10, 0, 0, 231, 0, 0, 0, 0, 11,
+ 255, 12, 0, 0, 0, 0, 0, 13, 0, 14,
+ 15, 16, 17, 18, 19, 20, 21, 22, 23, 0,
+ 24, 25, 26, 27, 28, 29, 30, 0, 0, 31,
+ 32, 33, 34, 4, 0, 0, 0, 5, 6, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 7, 8, 0, 0, 9,
+ 0, 0, 10, 0, 0, 0, 0, 0, 0, 0,
+ 11, 0, 12, 0, 0, 0, 0, 0, 13, 0,
14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
0, 24, 25, 26, 27, 28, 29, 30, 0, 0,
31, 32, 33, 34, 4, 0, 0, 0, 5, 6,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 7, 8, 0, 0,
9, 0, 0, 10, 0, 0, 0, 0, 0, 0,
- 0, 11, 237, 12, 0, 0, 0, 0, 0, 13,
+ 0, 11, 0, 12, 0, 0, 0, 0, 0, 13,
0, 14, 15, 16, 17, 18, 19, 20, 21, 22,
23, 0, 24, 25, 26, 27, 28, 29, 30, 0,
- 0, 31, 32, 33, 34, 4, 0, 0, 0, 5,
+ 0, 31, 32, 96, 97, 180, 0, 0, 0, 5,
6, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 7, 8, 0,
- 0, 9, 0, 0, 10, 0, 0, 0, 0, 0,
- 0, 0, 11, 0, 12, 0, 0, 0, 0, 0,
- 13, 0, 14, 15, 16, 17, 18, 19, 20, 21,
- 22, 23, 0, 24, 25, 26, 27, 28, 29, 30,
- 0, 0, 31, 32, 33, 34, 4, 0, 0, 0,
- 5, 6, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 7, 8,
- 0, 0, 9, 0, 0, 10, 0, 0, 0, 0,
- 0, 0, 0, 11, 0, 12, 0, 0, 0, 0,
- 0, 13, 0, 14, 15, 16, 17, 18, 19, 20,
- 21, 22, 23, 0, 24, 25, 26, 27, 28, 29,
- 30, 0, 0, 31, 32, 93, 94, 4, 0, 4,
- 0, 5, 6, 5, 6, 0, 0, 0, 0, 0,
+ 0, 9, 4, 0, 10, 0, 5, 6, 0, 0,
+ 0, 0, 0, 0, 12, 181, 0, 0, 0, 0,
+ 0, 182, 0, 0, 7, 8, 0, 19, 9, 0,
+ 22, 10, 0, 180, 0, 187, 0, 5, 6, 30,
+ 0, 12, 31, 32, 0, 0, 188, 0, 0, 0,
+ 0, 0, 0, 0, 19, 7, 8, 22, 0, 9,
+ 4, 0, 10, 0, 5, 6, 30, 0, 0, 31,
+ 32, 0, 12, 196, 0, 0, 0, 0, 0, 182,
+ 0, 0, 7, 8, 0, 19, 9, 0, 22, 10,
+ 0, 0, 0, 187, 0, 0, 0, 30, 0, 12,
+ 31, 32, 0, 4, 0, 0, 0, 5, 6, 0,
+ 0, 0, 19, 228, 0, 22, 0, 4, 0, 0,
+ 0, 5, 6, 0, 30, 7, 8, 31, 32, 9,
+ 0, 0, 10, 0, 0, 0, 0, 0, 0, 7,
+ 8, 0, 12, 9, 0, 0, 10, 0, 0, 0,
+ 0, 0, 0, 0, 0, 19, 12, 0, 22, 0,
+ 4, 188, 0, 0, 5, 6, 0, 30, 0, 19,
+ 31, 32, 22, 0, 0, 0, 0, 0, 0, 0,
+ 0, 30, 7, 8, 31, 32, 9, 4, 0, 10,
+ 0, 5, 6, 0, 0, 0, 296, 265, 0, 12,
0, 0, 0, 0, 0, 0, 0, 0, 0, 7,
- 8, 7, 8, 9, 0, 9, 10, 0, 10, 0,
- 0, 0, 179, 0, 11, 0, 12, 0, 12, 0,
- 0, 0, 13, 180, 0, 0, 0, 0, 0, 19,
- 0, 19, 22, 23, 22, 24, 25, 26, 27, 28,
- 29, 30, 0, 30, 31, 32, 31, 32, 172, 0,
- 4, 0, 5, 6, 5, 6, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 7, 8, 7, 8, 9, 0, 9, 10, 0, 10,
- 0, 0, 0, 0, 0, 0, 0, 12, 188, 12,
- 0, 0, 0, 0, 174, 86, 0, 0, 0, 0,
- 19, 0, 19, 22, 4, 22, 0, 0, 5, 6,
- 0, 0, 30, 0, 30, 31, 32, 31, 32, 0,
- 0, 0, 0, 0, 4, 0, 7, 8, 5, 6,
- 9, 0, 0, 10, 220, 0, 0, 179, 0, 0,
- 0, 0, 0, 12, 0, 0, 7, 8, 0, 0,
- 9, 0, 0, 10, 0, 0, 19, 0, 0, 22,
- 4, 0, 0, 12, 5, 6, 0, 0, 30, 0,
- 0, 31, 32, 0, 0, 0, 19, 0, 0, 22,
- 4, 0, 7, 8, 5, 6, 9, 0, 30, 10,
- 0, 31, 32, 0, 0, 0, 0, 0, 0, 12,
- 0, 0, 7, 8, 180, 0, 9, 0, 0, 10,
- 0, 0, 19, 0, 0, 22, 4, 246, 0, 12,
- 5, 6, 0, 0, 30, 277, 0, 31, 32, 0,
- 0, 0, 19, 0, 0, 22, 4, 0, 7, 8,
- 5, 6, 9, 0, 30, 10, 0, 31, 32, 0,
- 0, 0, 0, 0, 0, 12, 172, 0, 7, 8,
- 5, 6, 9, 0, 0, 10, 0, 0, 19, 0,
- 0, 22, 0, 0, 0, 12, 0, 0, 7, 8,
- 30, 0, 9, 31, 32, 10, 0, 0, 19, 0,
- 0, 22, 0, 0, 0, 12, 0, 0, 0, 0,
- 30, 0, 0, 31, 32, 0, 0, 0, 19, 0,
- 0, 22, 0, 0, 0, 0, 0, 0, 0, 0,
- 30, 0, 0, 31, 32, 105, 106, 107, 108, 109,
- 110, 0, 0, 0, 0, 111, 112, 113, 114, 115,
+ 8, 0, 19, 9, 4, 22, 10, 0, 5, 6,
+ 0, 0, 0, 0, 30, 0, 12, 31, 32, 0,
+ 0, 0, 0, 0, 0, 0, 7, 8, 0, 19,
+ 9, 180, 22, 10, 0, 5, 6, 0, 0, 0,
+ 0, 30, 0, 12, 31, 32, 0, 0, 0, 0,
+ 0, 0, 0, 7, 8, 0, 19, 9, 0, 22,
+ 10, 0, 0, 0, 0, 0, 0, 0, 30, 0,
+ 12, 31, 32, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 19, 0, 0, 22, 0, 0, 0,
+ 0, 0, 0, 0, 0, 30, 0, 0, 31, 32,
+ 108, 109, 110, 111, 112, 113, 0, 0, 0, 0,
+ 114, 115, 116, 117, 118, 119, 120, 121, 122, 123,
+ 124, 125, 126, 127, 128, 129, 130, 131, 132, 0,
+ 133, 134, 0, 0, 0, 0, 135, 108, 109, 110,
+ 111, 112, 113, 0, 179, 0, 0, 114, 115, 116,
+ 117, 118, 119, 120, 121, 122, 123, 124, 125, 126,
+ 127, 128, 129, 130, 131, 132, 0, 133, 134, 283,
+ 0, 0, 0, 135, 108, 109, 110, 111, 112, 113,
+ 284, 0, 0, 0, 114, 115, 116, 117, 118, 119,
+ 120, 121, 122, 123, 124, 125, 126, 127, 128, 129,
+ 130, 131, 132, 0, 133, 134, 283, 0, 0, 0,
+ 135, 108, 109, 110, 111, 112, 113, 294, 0, 0,
+ 0, 114, 115, 116, 117, 118, 119, 120, 121, 122,
+ 123, 124, 125, 126, 127, 128, 129, 130, 131, 132,
+ 0, 133, 134, 0, 0, 0, 0, 135, 108, 109,
+ 110, 111, 112, 113, 328, 0, 0, 0, 114, 115,
116, 117, 118, 119, 120, 121, 122, 123, 124, 125,
- 126, 127, 128, 129, 0, 130, 131, 0, 0, 0,
- 0, 132, 105, 106, 107, 108, 109, 110, 0, 171,
- 0, 0, 111, 112, 113, 114, 115, 116, 117, 118,
+ 126, 127, 128, 129, 130, 131, 132, 0, 133, 134,
+ 0, 0, 0, 0, 135, 108, 109, 110, 111, 112,
+ 113, 380, 0, 0, 0, 114, 115, 116, 117, 118,
119, 120, 121, 122, 123, 124, 125, 126, 127, 128,
- 129, 0, 130, 131, 264, 0, 0, 0, 132, 105,
- 106, 107, 108, 109, 110, 265, 0, 0, 0, 111,
- 112, 113, 114, 115, 116, 117, 118, 119, 120, 121,
- 122, 123, 124, 125, 126, 127, 128, 129, 0, 130,
- 131, 264, 0, 0, 0, 132, 105, 106, 107, 108,
- 109, 110, 275, 0, 0, 0, 111, 112, 113, 114,
- 115, 116, 117, 118, 119, 120, 121, 122, 123, 124,
- 125, 126, 127, 128, 129, 0, 130, 131, 0, 0,
- 0, 0, 132, 105, 106, 107, 108, 109, 110, 301,
- 0, 0, 0, 111, 112, 113, 114, 115, 116, 117,
- 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
- 128, 129, 0, 130, 131, 0, 0, 0, 0, 132,
- 105, 106, 107, 108, 109, 110, 344, 0, 0, 0,
- 111, 112, 113, 114, 115, 116, 117, 118, 119, 120,
- 121, 122, 123, 124, 125, 126, 127, 128, 129, 0,
- 130, 131, 0, 0, 0, 0, 132, 0, 0, 144,
- 0, 145, 105, 106, 107, 108, 109, 110, 0, 0,
- 0, 0, 111, 112, 113, 114, 115, 116, 117, 118,
- 119, 120, 121, 122, 123, 124, 125, 126, 127, 128,
- 129, 0, 130, 131, 0, 0, 0, 0, 132, 283,
- 0, 0, 0, 284, 105, 106, 107, 108, 109, 110,
- 0, 0, 0, 0, 111, 112, 113, 114, 115, 116,
+ 129, 130, 131, 132, 0, 133, 134, 0, 0, 0,
+ 0, 135, 0, 0, 147, 0, 148, 108, 109, 110,
+ 111, 112, 113, 0, 0, 0, 0, 114, 115, 116,
117, 118, 119, 120, 121, 122, 123, 124, 125, 126,
- 127, 128, 129, 0, 130, 131, 0, 0, 0, 0,
- 132, 353, 0, 0, 0, 354, 105, 106, 107, 108,
- 109, 110, 0, 0, 0, 0, 111, 112, 113, 114,
- 115, 116, 117, 118, 119, 120, 121, 122, 123, 124,
- 125, 126, 127, 128, 129, 0, 130, 131, 0, 0,
- 0, 0, 132, 0, 0, 251, 105, 106, 107, 108,
- 109, 110, 0, 0, 0, 0, 111, 112, 113, 114,
- 115, 116, 117, 118, 119, 120, 121, 122, 123, 124,
- 125, 126, 127, 128, 129, 0, 130, 131, 0, 0,
- 0, 0, 132, 0, 0, 252, 105, 106, 107, 108,
- 109, 110, 0, 0, 0, 0, 111, 112, 113, 114,
+ 127, 128, 129, 130, 131, 132, 0, 133, 134, 0,
+ 0, 0, 0, 135, 302, 0, 0, 0, 303, 108,
+ 109, 110, 111, 112, 113, 0, 0, 0, 0, 114,
115, 116, 117, 118, 119, 120, 121, 122, 123, 124,
- 125, 126, 127, 128, 129, 0, 130, 131, 0, 0,
- 0, 0, 132, 0, 0, 346, 105, 106, 107, 108,
- 109, 110, 0, 0, 0, 0, 111, 112, 113, 114,
+ 125, 126, 127, 128, 129, 130, 131, 132, 0, 133,
+ 134, 0, 0, 0, 0, 135, 389, 0, 0, 0,
+ 390, 108, 109, 110, 111, 112, 113, 0, 0, 0,
+ 0, 114, 115, 116, 117, 118, 119, 120, 121, 122,
+ 123, 124, 125, 126, 127, 128, 129, 130, 131, 132,
+ 0, 133, 134, 0, 0, 0, 0, 135, 0, 0,
+ 270, 108, 109, 110, 111, 112, 113, 0, 0, 0,
+ 0, 114, 115, 116, 117, 118, 119, 120, 121, 122,
+ 123, 124, 125, 126, 127, 128, 129, 130, 131, 132,
+ 0, 133, 134, 0, 0, 0, 0, 135, 0, 0,
+ 271, 108, 109, 110, 111, 112, 113, 0, 0, 0,
+ 0, 114, 115, 116, 117, 118, 119, 120, 121, 122,
+ 123, 124, 125, 126, 127, 128, 129, 130, 131, 132,
+ 0, 133, 134, 0, 0, 0, 0, 135, 0, 0,
+ 382, 108, 109, 110, 111, 112, 113, 0, 0, 0,
+ 0, 114, 115, 116, 117, 118, 119, 120, 121, 122,
+ 123, 124, 125, 126, 127, 128, 129, 130, 131, 132,
+ 0, 133, 134, 0, 0, 0, 0, 135, 0, 0,
+ 401, 108, 109, 110, 111, 112, 113, 0, 0, 0,
+ 0, 114, 115, 116, 117, 118, 119, 120, 121, 122,
+ 123, 124, 125, 126, 127, 128, 129, 130, 131, 132,
+ 0, 133, 134, 0, 0, 0, 0, 135, 355, 108,
+ 109, 110, 111, 112, 113, 0, 0, 0, 0, 114,
115, 116, 117, 118, 119, 120, 121, 122, 123, 124,
- 125, 126, 127, 128, 129, 0, 130, 131, 0, 0,
- 0, 0, 132, 0, 0, 363, 105, 106, 107, 108,
- 109, 110, 0, 0, 0, 0, 111, 112, 113, 114,
- 115, 116, 117, 118, 119, 120, 121, 122, 123, 124,
- 125, 126, 127, 128, 129, 0, 130, 131, 0, 0,
- 0, 0, 132, 328, 105, 106, 107, 108, 109, 110,
- 0, 0, 0, 0, 111, 112, 113, 114, 115, 116,
- 117, 118, 119, 120, 121, 122, 123, 124, 125, 126,
- 127, 128, 129, 0, 130, 131, 0, 0, 0, 0,
- 132, 373, 105, 106, 107, 108, 109, 110, 0, 0,
- 0, 0, 111, 112, 113, 114, 115, 116, 117, 118,
- 119, 120, 121, 122, 123, 124, 125, 126, 127, 128,
- 129, 0, 130, 131, 281, 0, 0, 0, 132, 105,
- 106, 107, 108, 109, 110, 0, 0, 0, 0, 111,
- 112, 113, 114, 115, 116, 117, 118, 119, 120, 121,
- 122, 123, 124, 125, 126, 127, 128, 129, 0, 130,
- 131, 0, 0, 0, 105, 132, 107, 108, 109, 110,
- 0, 0, 0, 0, 111, 112, 113, 114, 115, 116,
+ 125, 126, 127, 128, 129, 130, 131, 132, 0, 133,
+ 134, 0, 0, 0, 0, 135, 413, 108, 109, 110,
+ 111, 112, 113, 0, 0, 0, 0, 114, 115, 116,
117, 118, 119, 120, 121, 122, 123, 124, 125, 126,
- 127, 128, 129, 0, 130, 131, 0, 0, 0, 324,
- 132, 105, 0, 107, 108, 109, 110, 0, 0, 0,
- 0, 111, 112, 113, 114, 115, 116, 117, 118, 119,
+ 127, 128, 129, 130, 131, 132, 0, 133, 134, 300,
+ 0, 0, 0, 135, 108, 109, 110, 111, 112, 113,
+ 0, 0, 0, 0, 114, 115, 116, 117, 118, 119,
120, 121, 122, 123, 124, 125, 126, 127, 128, 129,
- 0, 130, 131, 0, 0, 0, 326, 132, 105, 0,
- 107, 108, 109, 110, 0, 0, 0, 0, 111, 112,
- 113, 114, 115, 116, 117, 118, 119, 120, 121, 122,
- 123, 124, 125, 126, 127, 128, 129, 0, 130, 131,
- 0, 0, 0, 351, 132, 105, 0, 107, 108, 109,
- 110, 0, 0, 0, 0, 111, 112, 113, 114, 115,
- 116, 117, 118, 119, 120, 121, 122, 123, 124, 125,
- 126, 127, 128, 129, 0, 130, 131, 0, 0, 0,
- 0, 132, 106, 107, 108, 109, 110, 0, 0, 0,
- 0, 111, 112, 113, 114, 115, 116, 117, 118, 119,
- 120, 121, 122, 123, 124, 125, 126, 127, 128, 129,
- 0, 0, 131, 0, 0, 0, 0, 132, 106, 107,
- 108, 109, 110, 0, 0, 0, 0, 0, 112, 113,
+ 130, 131, 132, 0, 133, 134, 0, 0, 0, 108,
+ 135, 110, 111, 112, 113, 0, 0, 0, 0, 114,
+ 115, 116, 117, 118, 119, 120, 121, 122, 123, 124,
+ 125, 126, 127, 128, 129, 130, 131, 132, 0, 133,
+ 134, 0, 0, 0, 351, 135, 108, 0, 110, 111,
+ 112, 113, 0, 0, 0, 0, 114, 115, 116, 117,
+ 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+ 128, 129, 130, 131, 132, 0, 133, 134, 0, 0,
+ 0, 353, 135, 108, 0, 110, 111, 112, 113, 0,
+ 0, 0, 0, 114, 115, 116, 117, 118, 119, 120,
+ 121, 122, 123, 124, 125, 126, 127, 128, 129, 130,
+ 131, 132, 0, 133, 134, 0, 0, 0, 387, 135,
+ 108, 0, 110, 111, 112, 113, 0, 0, 0, 0,
114, 115, 116, 117, 118, 119, 120, 121, 122, 123,
- 124, 125, 126, 127, 128, 129, 106, 107, 108, 109,
- 110, 0, 0, 132, 0, 0, 0, 113, 114, 115,
- 116, 117, 118, 119, 120, 121, 122, 123, 124, 125,
- 126, 127, 128, 129, 106, 107, 108, 109, 110, 0,
- 0, 132, 0, 0, 0, 0, 114, 115, 116, 117,
+ 124, 125, 126, 127, 128, 129, 130, 131, 132, 0,
+ 133, 134, 0, 0, 0, 0, 135, 109, 110, 111,
+ 112, 113, 0, 0, 0, 0, 114, 115, 116, 117,
+ 118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
+ 128, 129, 130, 131, 132, 0, 0, 134, 0, 0,
+ 0, 0, 135, 109, 110, 111, 112, 113, 0, 0,
+ 0, 0, 0, 115, 116, 117, 118, 119, 120, 121,
+ 122, 123, 124, 125, 126, 127, 128, 129, 130, 131,
+ 132, 109, 110, 111, 112, 113, 0, 0, 135, 0,
+ 0, 0, 116, 117, 118, 119, 120, 121, 122, 123,
+ 124, 125, 126, 127, 128, 129, 130, 131, 132, 109,
+ 110, 111, 112, 113, 0, 0, 135, 0, 0, 0,
+ 0, 117, 118, 119, 120, 121, 122, 123, 124, 125,
+ 126, 127, 128, 129, 130, 131, 132, 109, 110, 111,
+ 112, 113, 0, 0, 135, 0, 0, 0, 0, 0,
118, 119, 120, 121, 122, 123, 124, 125, 126, 127,
- 128, 129, 106, 107, 108, 109, 110, 0, 0, 132,
- 0, 0, 0, 0, 0, 115, 116, 117, 118, 119,
+ 128, 129, 130, 131, 132, 109, 110, 111, 112, 113,
+ 0, 0, 135, 0, 0, 0, 0, 0, 0, 0,
120, 121, 122, 123, 124, 125, 126, 127, 128, 129,
- 106, 107, 108, 109, 110, 0, 0, 132, 0, 0,
- 0, 0, 0, 0, 0, 117, 118, 119, 120, 121,
- 122, 123, 124, 125, 126, 127, 128, 129, 106, 107,
- 108, 109, 110, 0, 0, 132, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 121, 122, 123,
- 124, 125, 126, 127, 128, 129, 106, 107, 108, 109,
- 110, 0, 0, 132, 106, 107, 108, 109, 110, 0,
- 0, 0, 0, 0, 0, 121, 122, 123, 124, 125,
- 126, 127, 128, 0, 122, 123, 124, 125, 126, 127,
- 128, 132, 0, 0, 0, 0, 0, 0, 0, 132
+ 130, 131, 132, 109, 110, 111, 112, 113, 0, 0,
+ 135, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 124, 125, 126, 127, 128, 129, 130, 131,
+ 132, 109, 110, 111, 112, 113, 0, 0, 135, 109,
+ 110, 111, 112, 113, 0, 0, 0, 0, 0, 0,
+ 124, 125, 126, 127, 128, 129, 130, 131, 0, 125,
+ 126, 127, 128, 129, 130, 131, 135, 0, 0, 0,
+ 0, 0, 0, 0, 135
};
static const yytype_int16 yycheck[] =
{
- 5, 6, 7, 8, 83, 10, 25, 12, 21, 174,
- 16, 3, 2, 240, 135, 35, 300, 3, 37, 3,
- 184, 3, 12, 3, 29, 15, 31, 3, 18, 43,
- 3, 21, 22, 43, 3, 49, 246, 29, 58, 49,
- 43, 0, 3, 44, 44, 41, 49, 37, 48, 29,
- 51, 27, 336, 49, 68, 75, 3, 42, 68, 79,
- 42, 46, 44, 40, 46, 68, 27, 57, 42, 42,
- 83, 298, 299, 46, 238, 80, 81, 42, 44, 71,
- 46, 46, 36, 247, 89, 71, 91, 71, 42, 10,
- 11, 42, 46, 83, 304, 260, 261, 102, 42, 104,
- 105, 239, 223, 43, 109, 45, 111, 112, 113, 114,
+ 5, 6, 7, 8, 25, 10, 86, 12, 161, 192,
+ 35, 138, 2, 16, 3, 21, 37, 16, 3, 18,
+ 3, 3, 12, 3, 29, 15, 31, 3, 18, 3,
+ 3, 21, 22, 58, 3, 265, 327, 3, 3, 182,
+ 29, 42, 44, 0, 46, 43, 29, 37, 44, 50,
+ 43, 49, 43, 78, 42, 51, 49, 82, 49, 43,
+ 29, 40, 50, 52, 29, 49, 48, 57, 42, 42,
+ 68, 3, 57, 259, 257, 68, 42, 68, 83, 84,
+ 86, 372, 55, 266, 68, 58, 71, 92, 71, 94,
+ 45, 71, 42, 48, 67, 71, 86, 70, 71, 42,
+ 105, 331, 107, 108, 231, 45, 42, 112, 48, 114,
115, 116, 117, 118, 119, 120, 121, 122, 123, 124,
- 125, 126, 127, 128, 129, 130, 131, 132, 133, 267,
- 340, 341, 137, 45, 48, 140, 48, 43, 143, 48,
- 145, 147, 162, 49, 3, 40, 356, 42, 48, 3,
- 43, 46, 45, 7, 8, 160, 49, 43, 368, 297,
- 46, 43, 68, 45, 42, 155, 44, 49, 46, 174,
- 308, 25, 26, 48, 179, 29, 42, 256, 32, 31,
- 46, 45, 187, 42, 48, 323, 40, 41, 42, 194,
- 195, 45, 43, 3, 45, 49, 55, 3, 49, 58,
- 43, 55, 45, 48, 58, 343, 49, 45, 67, 48,
- 48, 70, 71, 67, 48, 220, 70, 71, 50, 50,
- 40, 226, 25, 26, 27, 28, 29, 30, 31, 43,
- 243, 45, 251, 252, 43, 49, 45, 40, 3, 3,
- 49, 246, 7, 8, 249, 42, 43, 44, 253, 46,
- 255, 44, 257, 243, 61, 260, 261, 3, 46, 264,
- 25, 26, 45, 34, 29, 3, 42, 32, 44, 348,
- 46, 40, 277, 3, 47, 42, 281, 42, 43, 284,
- 46, 3, 45, 34, 49, 27, 28, 29, 30, 31,
- 55, 48, 47, 58, 47, 47, 5, 5, 3, 304,
- 48, 48, 67, 3, 3, 70, 71, 68, 3, 314,
- 45, 60, 48, 34, 41, 48, 34, 41, 43, 324,
- 57, 326, 37, 73, 154, 289, 345, 18, 21, 83,
- 22, 186, 161, 3, 74, 340, 341, 7, 8, 134,
- 348, -1, 104, 102, 363, -1, 351, -1, -1, 354,
- -1, 356, -1, 372, -1, 25, 26, -1, -1, 29,
- -1, -1, 32, 368, -1, -1, -1, -1, -1, -1,
- 40, 41, 42, -1, -1, -1, -1, -1, 48, -1,
+ 125, 126, 127, 128, 129, 130, 131, 132, 133, 134,
+ 135, 136, 3, 258, 3, 140, 279, 280, 143, 325,
+ 326, 146, 3, 148, 150, 170, 376, 377, 151, 155,
+ 3, 41, 151, 42, 160, 44, 36, 46, 27, 49,
+ 150, 286, 42, 168, 394, 155, 46, 43, 3, 45,
+ 160, 42, 162, 44, 27, 46, 44, 182, 408, 3,
+ 48, 42, 187, 7, 8, 46, 40, 43, 42, 45,
+ 195, 48, 46, 49, 43, 275, 45, 202, 203, 324,
+ 49, 25, 26, 43, 48, 29, 46, 155, 32, 43,
+ 335, 45, 160, 366, 31, 49, 40, 42, 42, 44,
+ 43, 46, 45, 228, 48, 350, 49, 10, 11, 234,
+ 43, 55, 45, 48, 58, 59, 49, 61, 62, 63,
+ 64, 65, 66, 67, 42, 48, 70, 71, 46, 270,
+ 271, 43, 42, 45, 379, 42, 262, 49, 42, 46,
+ 265, 40, 46, 268, 42, 43, 44, 272, 46, 274,
+ 45, 276, 262, 48, 279, 280, 45, 45, 283, 48,
+ 48, 48, 43, 3, 45, 3, 48, 7, 8, 7,
+ 8, 296, 43, 48, 45, 300, 3, 43, 303, 45,
+ 306, 43, 308, 45, 384, 25, 26, 25, 26, 29,
+ 42, 29, 32, 43, 32, 45, 306, 44, 308, 3,
+ 40, 41, 42, 61, 42, 45, 331, 46, 45, 49,
+ 48, 34, 3, 3, 40, 55, 341, 55, 58, 3,
+ 58, 27, 28, 29, 30, 31, 351, 67, 353, 67,
+ 70, 71, 70, 71, 47, 46, 3, 42, 48, 34,
+ 381, 3, 45, 3, 5, 7, 8, 47, 47, 47,
+ 5, 376, 377, 25, 26, 27, 28, 29, 30, 31,
+ 401, 34, 387, 25, 26, 390, 3, 29, 40, 394,
+ 32, 412, 48, 48, 68, 3, 3, 48, 40, 41,
+ 42, 50, 48, 408, 48, 3, 48, 45, 50, 51,
+ 52, 53, 54, 55, 56, 57, 58, 59, 48, 61,
+ 62, 63, 64, 65, 66, 67, 60, 3, 70, 71,
+ 72, 73, 3, 34, 48, 41, 7, 8, 48, 34,
+ 43, 41, 75, 37, 57, 308, 310, 314, 164, 21,
+ 86, 194, 22, 76, 25, 26, 169, 107, 29, 384,
+ 105, 32, -1, -1, 137, -1, -1, -1, -1, 40,
+ 41, 42, -1, -1, -1, -1, -1, 48, -1, 50,
+ 51, 52, 53, 54, 55, 56, 57, 58, 59, -1,
+ 61, 62, 63, 64, 65, 66, 67, -1, -1, 70,
+ 71, 72, 73, 3, -1, -1, -1, 7, 8, -1,
+ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, -1, -1, 25, 26, -1, -1, 29,
+ -1, -1, 32, -1, -1, -1, -1, -1, -1, -1,
+ 40, -1, 42, -1, -1, -1, -1, -1, 48, -1,
50, 51, 52, 53, 54, 55, 56, 57, 58, 59,
-1, 61, 62, 63, 64, 65, 66, 67, -1, -1,
70, 71, 72, 73, 3, -1, -1, -1, 7, 8,
-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, 25, 26, -1, -1,
29, -1, -1, 32, -1, -1, -1, -1, -1, -1,
- -1, 40, 41, 42, -1, -1, -1, -1, -1, 48,
+ -1, 40, -1, 42, -1, -1, -1, -1, -1, 48,
-1, 50, 51, 52, 53, 54, 55, 56, 57, 58,
59, -1, 61, 62, 63, 64, 65, 66, 67, -1,
-1, 70, 71, 72, 73, 3, -1, -1, -1, 7,
8, -1, -1, -1, -1, -1, -1, -1, -1, -1,
-1, -1, -1, -1, -1, -1, -1, 25, 26, -1,
- -1, 29, -1, -1, 32, -1, -1, -1, -1, -1,
- -1, -1, 40, -1, 42, -1, -1, -1, -1, -1,
- 48, -1, 50, 51, 52, 53, 54, 55, 56, 57,
- 58, 59, -1, 61, 62, 63, 64, 65, 66, 67,
- -1, -1, 70, 71, 72, 73, 3, -1, -1, -1,
- 7, 8, -1, -1, -1, -1, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, 25, 26,
- -1, -1, 29, -1, -1, 32, -1, -1, -1, -1,
- -1, -1, -1, 40, -1, 42, -1, -1, -1, -1,
- -1, 48, -1, 50, 51, 52, 53, 54, 55, 56,
- 57, 58, 59, -1, 61, 62, 63, 64, 65, 66,
- 67, -1, -1, 70, 71, 72, 73, 3, -1, 3,
- -1, 7, 8, 7, 8, -1, -1, -1, -1, -1,
+ -1, 29, 3, -1, 32, -1, 7, 8, -1, -1,
+ -1, -1, -1, -1, 42, 43, -1, -1, -1, -1,
+ -1, 49, -1, -1, 25, 26, -1, 55, 29, -1,
+ 58, 32, -1, 3, -1, 36, -1, 7, 8, 67,
+ -1, 42, 70, 71, -1, -1, 47, -1, -1, -1,
+ -1, -1, -1, -1, 55, 25, 26, 58, -1, 29,
+ 3, -1, 32, -1, 7, 8, 67, -1, -1, 70,
+ 71, -1, 42, 43, -1, -1, -1, -1, -1, 49,
+ -1, -1, 25, 26, -1, 55, 29, -1, 58, 32,
+ -1, -1, -1, 36, -1, -1, -1, 67, -1, 42,
+ 70, 71, -1, 3, -1, -1, -1, 7, 8, -1,
+ -1, -1, 55, 13, -1, 58, -1, 3, -1, -1,
+ -1, 7, 8, -1, 67, 25, 26, 70, 71, 29,
+ -1, -1, 32, -1, -1, -1, -1, -1, -1, 25,
+ 26, -1, 42, 29, -1, -1, 32, -1, -1, -1,
+ -1, -1, -1, -1, -1, 55, 42, -1, 58, -1,
+ 3, 47, -1, -1, 7, 8, -1, 67, -1, 55,
+ 70, 71, 58, -1, -1, -1, -1, -1, -1, -1,
+ -1, 67, 25, 26, 70, 71, 29, 3, -1, 32,
+ -1, 7, 8, -1, -1, -1, 12, 40, -1, 42,
-1, -1, -1, -1, -1, -1, -1, -1, -1, 25,
- 26, 25, 26, 29, -1, 29, 32, -1, 32, -1,
- -1, -1, 36, -1, 40, -1, 42, -1, 42, -1,
- -1, -1, 48, 47, -1, -1, -1, -1, -1, 55,
- -1, 55, 58, 59, 58, 61, 62, 63, 64, 65,
- 66, 67, -1, 67, 70, 71, 70, 71, 3, -1,
- 3, -1, 7, 8, 7, 8, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
- 25, 26, 25, 26, 29, -1, 29, 32, -1, 32,
- -1, -1, -1, -1, -1, -1, -1, 42, 43, 42,
- -1, -1, -1, -1, 49, 48, -1, -1, -1, -1,
- 55, -1, 55, 58, 3, 58, -1, -1, 7, 8,
- -1, -1, 67, -1, 67, 70, 71, 70, 71, -1,
- -1, -1, -1, -1, 3, -1, 25, 26, 7, 8,
- 29, -1, -1, 32, 13, -1, -1, 36, -1, -1,
- -1, -1, -1, 42, -1, -1, 25, 26, -1, -1,
- 29, -1, -1, 32, -1, -1, 55, -1, -1, 58,
- 3, -1, -1, 42, 7, 8, -1, -1, 67, -1,
- -1, 70, 71, -1, -1, -1, 55, -1, -1, 58,
- 3, -1, 25, 26, 7, 8, 29, -1, 67, 32,
- -1, 70, 71, -1, -1, -1, -1, -1, -1, 42,
- -1, -1, 25, 26, 47, -1, 29, -1, -1, 32,
- -1, -1, 55, -1, -1, 58, 3, 40, -1, 42,
- 7, 8, -1, -1, 67, 12, -1, 70, 71, -1,
- -1, -1, 55, -1, -1, 58, 3, -1, 25, 26,
- 7, 8, 29, -1, 67, 32, -1, 70, 71, -1,
- -1, -1, -1, -1, -1, 42, 3, -1, 25, 26,
- 7, 8, 29, -1, -1, 32, -1, -1, 55, -1,
- -1, 58, -1, -1, -1, 42, -1, -1, 25, 26,
- 67, -1, 29, 70, 71, 32, -1, -1, 55, -1,
- -1, 58, -1, -1, -1, 42, -1, -1, -1, -1,
- 67, -1, -1, 70, 71, -1, -1, -1, 55, -1,
- -1, 58, -1, -1, -1, -1, -1, -1, -1, -1,
- 67, -1, -1, 70, 71, 4, 5, 6, 7, 8,
- 9, -1, -1, -1, -1, 14, 15, 16, 17, 18,
+ 26, -1, 55, 29, 3, 58, 32, -1, 7, 8,
+ -1, -1, -1, -1, 67, -1, 42, 70, 71, -1,
+ -1, -1, -1, -1, -1, -1, 25, 26, -1, 55,
+ 29, 3, 58, 32, -1, 7, 8, -1, -1, -1,
+ -1, 67, -1, 42, 70, 71, -1, -1, -1, -1,
+ -1, -1, -1, 25, 26, -1, 55, 29, -1, 58,
+ 32, -1, -1, -1, -1, -1, -1, -1, 67, -1,
+ 42, 70, 71, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, -1, 55, -1, -1, 58, -1, -1, -1,
+ -1, -1, -1, -1, -1, 67, -1, -1, 70, 71,
+ 4, 5, 6, 7, 8, 9, -1, -1, -1, -1,
+ 14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
+ 24, 25, 26, 27, 28, 29, 30, 31, 32, -1,
+ 34, 35, -1, -1, -1, -1, 40, 4, 5, 6,
+ 7, 8, 9, -1, 48, -1, -1, 14, 15, 16,
+ 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
+ 27, 28, 29, 30, 31, 32, -1, 34, 35, 36,
+ -1, -1, -1, 40, 4, 5, 6, 7, 8, 9,
+ 47, -1, -1, -1, 14, 15, 16, 17, 18, 19,
+ 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
+ 30, 31, 32, -1, 34, 35, 36, -1, -1, -1,
+ 40, 4, 5, 6, 7, 8, 9, 47, -1, -1,
+ -1, 14, 15, 16, 17, 18, 19, 20, 21, 22,
+ 23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
+ -1, 34, 35, -1, -1, -1, -1, 40, 4, 5,
+ 6, 7, 8, 9, 47, -1, -1, -1, 14, 15,
+ 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
+ 26, 27, 28, 29, 30, 31, 32, -1, 34, 35,
+ -1, -1, -1, -1, 40, 4, 5, 6, 7, 8,
+ 9, 47, -1, -1, -1, 14, 15, 16, 17, 18,
19, 20, 21, 22, 23, 24, 25, 26, 27, 28,
29, 30, 31, 32, -1, 34, 35, -1, -1, -1,
- -1, 40, 4, 5, 6, 7, 8, 9, -1, 48,
- -1, -1, 14, 15, 16, 17, 18, 19, 20, 21,
- 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
- 32, -1, 34, 35, 36, -1, -1, -1, 40, 4,
- 5, 6, 7, 8, 9, 47, -1, -1, -1, 14,
+ -1, 40, -1, -1, 43, -1, 45, 4, 5, 6,
+ 7, 8, 9, -1, -1, -1, -1, 14, 15, 16,
+ 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
+ 27, 28, 29, 30, 31, 32, -1, 34, 35, -1,
+ -1, -1, -1, 40, 41, -1, -1, -1, 45, 4,
+ 5, 6, 7, 8, 9, -1, -1, -1, -1, 14,
+ 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
+ 25, 26, 27, 28, 29, 30, 31, 32, -1, 34,
+ 35, -1, -1, -1, -1, 40, 41, -1, -1, -1,
+ 45, 4, 5, 6, 7, 8, 9, -1, -1, -1,
+ -1, 14, 15, 16, 17, 18, 19, 20, 21, 22,
+ 23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
+ -1, 34, 35, -1, -1, -1, -1, 40, -1, -1,
+ 43, 4, 5, 6, 7, 8, 9, -1, -1, -1,
+ -1, 14, 15, 16, 17, 18, 19, 20, 21, 22,
+ 23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
+ -1, 34, 35, -1, -1, -1, -1, 40, -1, -1,
+ 43, 4, 5, 6, 7, 8, 9, -1, -1, -1,
+ -1, 14, 15, 16, 17, 18, 19, 20, 21, 22,
+ 23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
+ -1, 34, 35, -1, -1, -1, -1, 40, -1, -1,
+ 43, 4, 5, 6, 7, 8, 9, -1, -1, -1,
+ -1, 14, 15, 16, 17, 18, 19, 20, 21, 22,
+ 23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
+ -1, 34, 35, -1, -1, -1, -1, 40, -1, -1,
+ 43, 4, 5, 6, 7, 8, 9, -1, -1, -1,
+ -1, 14, 15, 16, 17, 18, 19, 20, 21, 22,
+ 23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
+ -1, 34, 35, -1, -1, -1, -1, 40, 41, 4,
+ 5, 6, 7, 8, 9, -1, -1, -1, -1, 14,
15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
25, 26, 27, 28, 29, 30, 31, 32, -1, 34,
- 35, 36, -1, -1, -1, 40, 4, 5, 6, 7,
- 8, 9, 47, -1, -1, -1, 14, 15, 16, 17,
+ 35, -1, -1, -1, -1, 40, 41, 4, 5, 6,
+ 7, 8, 9, -1, -1, -1, -1, 14, 15, 16,
+ 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
+ 27, 28, 29, 30, 31, 32, -1, 34, 35, 36,
+ -1, -1, -1, 40, 4, 5, 6, 7, 8, 9,
+ -1, -1, -1, -1, 14, 15, 16, 17, 18, 19,
+ 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
+ 30, 31, 32, -1, 34, 35, -1, -1, -1, 4,
+ 40, 6, 7, 8, 9, -1, -1, -1, -1, 14,
+ 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
+ 25, 26, 27, 28, 29, 30, 31, 32, -1, 34,
+ 35, -1, -1, -1, 39, 40, 4, -1, 6, 7,
+ 8, 9, -1, -1, -1, -1, 14, 15, 16, 17,
18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
28, 29, 30, 31, 32, -1, 34, 35, -1, -1,
- -1, -1, 40, 4, 5, 6, 7, 8, 9, 47,
+ -1, 39, 40, 4, -1, 6, 7, 8, 9, -1,
-1, -1, -1, 14, 15, 16, 17, 18, 19, 20,
21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
- 31, 32, -1, 34, 35, -1, -1, -1, -1, 40,
- 4, 5, 6, 7, 8, 9, 47, -1, -1, -1,
+ 31, 32, -1, 34, 35, -1, -1, -1, 39, 40,
+ 4, -1, 6, 7, 8, 9, -1, -1, -1, -1,
14, 15, 16, 17, 18, 19, 20, 21, 22, 23,
24, 25, 26, 27, 28, 29, 30, 31, 32, -1,
- 34, 35, -1, -1, -1, -1, 40, -1, -1, 43,
- -1, 45, 4, 5, 6, 7, 8, 9, -1, -1,
- -1, -1, 14, 15, 16, 17, 18, 19, 20, 21,
- 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
- 32, -1, 34, 35, -1, -1, -1, -1, 40, 41,
- -1, -1, -1, 45, 4, 5, 6, 7, 8, 9,
- -1, -1, -1, -1, 14, 15, 16, 17, 18, 19,
- 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
- 30, 31, 32, -1, 34, 35, -1, -1, -1, -1,
- 40, 41, -1, -1, -1, 45, 4, 5, 6, 7,
- 8, 9, -1, -1, -1, -1, 14, 15, 16, 17,
- 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
- 28, 29, 30, 31, 32, -1, 34, 35, -1, -1,
- -1, -1, 40, -1, -1, 43, 4, 5, 6, 7,
- 8, 9, -1, -1, -1, -1, 14, 15, 16, 17,
- 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
- 28, 29, 30, 31, 32, -1, 34, 35, -1, -1,
- -1, -1, 40, -1, -1, 43, 4, 5, 6, 7,
- 8, 9, -1, -1, -1, -1, 14, 15, 16, 17,
- 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
- 28, 29, 30, 31, 32, -1, 34, 35, -1, -1,
- -1, -1, 40, -1, -1, 43, 4, 5, 6, 7,
- 8, 9, -1, -1, -1, -1, 14, 15, 16, 17,
- 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
- 28, 29, 30, 31, 32, -1, 34, 35, -1, -1,
- -1, -1, 40, -1, -1, 43, 4, 5, 6, 7,
+ 34, 35, -1, -1, -1, -1, 40, 5, 6, 7,
8, 9, -1, -1, -1, -1, 14, 15, 16, 17,
18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
- 28, 29, 30, 31, 32, -1, 34, 35, -1, -1,
- -1, -1, 40, 41, 4, 5, 6, 7, 8, 9,
- -1, -1, -1, -1, 14, 15, 16, 17, 18, 19,
- 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
- 30, 31, 32, -1, 34, 35, -1, -1, -1, -1,
- 40, 41, 4, 5, 6, 7, 8, 9, -1, -1,
- -1, -1, 14, 15, 16, 17, 18, 19, 20, 21,
+ 28, 29, 30, 31, 32, -1, -1, 35, -1, -1,
+ -1, -1, 40, 5, 6, 7, 8, 9, -1, -1,
+ -1, -1, -1, 15, 16, 17, 18, 19, 20, 21,
22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
- 32, -1, 34, 35, 36, -1, -1, -1, 40, 4,
- 5, 6, 7, 8, 9, -1, -1, -1, -1, 14,
- 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
- 25, 26, 27, 28, 29, 30, 31, 32, -1, 34,
- 35, -1, -1, -1, 4, 40, 6, 7, 8, 9,
- -1, -1, -1, -1, 14, 15, 16, 17, 18, 19,
+ 32, 5, 6, 7, 8, 9, -1, -1, 40, -1,
+ -1, -1, 16, 17, 18, 19, 20, 21, 22, 23,
+ 24, 25, 26, 27, 28, 29, 30, 31, 32, 5,
+ 6, 7, 8, 9, -1, -1, 40, -1, -1, -1,
+ -1, 17, 18, 19, 20, 21, 22, 23, 24, 25,
+ 26, 27, 28, 29, 30, 31, 32, 5, 6, 7,
+ 8, 9, -1, -1, 40, -1, -1, -1, -1, -1,
+ 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,
+ 28, 29, 30, 31, 32, 5, 6, 7, 8, 9,
+ -1, -1, 40, -1, -1, -1, -1, -1, -1, -1,
20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
- 30, 31, 32, -1, 34, 35, -1, -1, -1, 39,
- 40, 4, -1, 6, 7, 8, 9, -1, -1, -1,
- -1, 14, 15, 16, 17, 18, 19, 20, 21, 22,
- 23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
- -1, 34, 35, -1, -1, -1, 39, 40, 4, -1,
- 6, 7, 8, 9, -1, -1, -1, -1, 14, 15,
- 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,
- 26, 27, 28, 29, 30, 31, 32, -1, 34, 35,
- -1, -1, -1, 39, 40, 4, -1, 6, 7, 8,
- 9, -1, -1, -1, -1, 14, 15, 16, 17, 18,
- 19, 20, 21, 22, 23, 24, 25, 26, 27, 28,
- 29, 30, 31, 32, -1, 34, 35, -1, -1, -1,
- -1, 40, 5, 6, 7, 8, 9, -1, -1, -1,
- -1, 14, 15, 16, 17, 18, 19, 20, 21, 22,
- 23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
- -1, -1, 35, -1, -1, -1, -1, 40, 5, 6,
- 7, 8, 9, -1, -1, -1, -1, -1, 15, 16,
- 17, 18, 19, 20, 21, 22, 23, 24, 25, 26,
- 27, 28, 29, 30, 31, 32, 5, 6, 7, 8,
- 9, -1, -1, 40, -1, -1, -1, 16, 17, 18,
- 19, 20, 21, 22, 23, 24, 25, 26, 27, 28,
- 29, 30, 31, 32, 5, 6, 7, 8, 9, -1,
- -1, 40, -1, -1, -1, -1, 17, 18, 19, 20,
- 21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
- 31, 32, 5, 6, 7, 8, 9, -1, -1, 40,
- -1, -1, -1, -1, -1, 18, 19, 20, 21, 22,
- 23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
- 5, 6, 7, 8, 9, -1, -1, 40, -1, -1,
- -1, -1, -1, -1, -1, 20, 21, 22, 23, 24,
- 25, 26, 27, 28, 29, 30, 31, 32, 5, 6,
- 7, 8, 9, -1, -1, 40, -1, -1, -1, -1,
- -1, -1, -1, -1, -1, -1, -1, 24, 25, 26,
- 27, 28, 29, 30, 31, 32, 5, 6, 7, 8,
- 9, -1, -1, 40, 5, 6, 7, 8, 9, -1,
- -1, -1, -1, -1, -1, 24, 25, 26, 27, 28,
- 29, 30, 31, -1, 25, 26, 27, 28, 29, 30,
- 31, 40, -1, -1, -1, -1, -1, -1, -1, 40
+ 30, 31, 32, 5, 6, 7, 8, 9, -1, -1,
+ 40, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+ -1, -1, 24, 25, 26, 27, 28, 29, 30, 31,
+ 32, 5, 6, 7, 8, 9, -1, -1, 40, 5,
+ 6, 7, 8, 9, -1, -1, -1, -1, -1, -1,
+ 24, 25, 26, 27, 28, 29, 30, 31, -1, 25,
+ 26, 27, 28, 29, 30, 31, 40, -1, -1, -1,
+ -1, -1, -1, -1, 40
};
/* YYSTOS[STATE-NUM] -- The symbol kind of the accessing symbol of
state STATE-NUM. */
-static const yytype_int8 yystos[] =
+static const yytype_uint8 yystos[] =
{
0, 77, 78, 0, 3, 7, 8, 25, 26, 29,
32, 40, 42, 48, 50, 51, 52, 53, 54, 55,
56, 57, 58, 59, 61, 62, 63, 64, 65, 66,
- 67, 70, 71, 72, 73, 80, 81, 82, 83, 89,
- 90, 91, 92, 99, 106, 107, 109, 113, 119, 120,
- 121, 80, 113, 113, 113, 113, 113, 79, 80, 112,
- 113, 3, 71, 86, 87, 88, 80, 87, 3, 71,
- 3, 80, 86, 40, 3, 80, 89, 91, 80, 92,
- 42, 42, 119, 42, 48, 48, 48, 113, 113, 42,
- 44, 46, 93, 72, 73, 83, 119, 48, 3, 95,
- 96, 97, 42, 44, 46, 4, 5, 6, 7, 8,
- 9, 14, 15, 16, 17, 18, 19, 20, 21, 22,
- 23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
- 34, 35, 40, 114, 115, 116, 48, 46, 41, 81,
- 43, 93, 43, 45, 43, 45, 3, 45, 48, 48,
- 48, 48, 48, 51, 50, 78, 99, 46, 3, 42,
- 46, 93, 94, 113, 113, 61, 90, 91, 120, 122,
- 125, 48, 3, 43, 49, 110, 111, 113, 3, 36,
- 47, 108, 113, 46, 42, 93, 45, 34, 43, 111,
- 3, 108, 113, 113, 10, 11, 117, 118, 113, 113,
- 113, 113, 113, 113, 113, 113, 113, 113, 113, 113,
- 113, 113, 113, 113, 113, 113, 113, 113, 113, 113,
- 13, 113, 113, 116, 115, 113, 43, 113, 113, 3,
- 87, 3, 27, 84, 85, 27, 85, 41, 42, 43,
- 49, 68, 103, 104, 105, 113, 40, 42, 100, 46,
- 93, 43, 43, 42, 3, 48, 45, 34, 110, 43,
- 45, 49, 113, 47, 36, 47, 47, 43, 103, 96,
- 98, 100, 113, 43, 47, 47, 113, 12, 113, 5,
- 5, 36, 113, 41, 45, 115, 113, 3, 48, 45,
- 48, 48, 48, 43, 103, 121, 105, 43, 45, 49,
- 91, 47, 41, 45, 49, 98, 101, 102, 43, 103,
- 113, 119, 119, 113, 36, 113, 123, 120, 113, 110,
- 110, 113, 121, 43, 39, 113, 39, 113, 41, 113,
- 3, 84, 43, 121, 105, 105, 3, 97, 98, 41,
- 49, 45, 121, 43, 47, 60, 43, 113, 48, 121,
- 113, 39, 113, 41, 45, 97, 34, 41, 98, 98,
- 121, 119, 48, 43, 124, 125, 113, 113, 34, 98,
- 41, 119, 43, 41, 98, 119
+ 67, 70, 71, 72, 73, 80, 81, 82, 83, 93,
+ 94, 95, 96, 103, 110, 111, 113, 117, 123, 124,
+ 125, 80, 117, 117, 117, 117, 117, 79, 80, 116,
+ 117, 3, 71, 90, 91, 92, 80, 57, 90, 91,
+ 3, 71, 3, 80, 90, 40, 3, 52, 80, 93,
+ 95, 80, 96, 42, 42, 123, 42, 48, 48, 48,
+ 117, 117, 42, 44, 46, 97, 72, 73, 83, 123,
+ 48, 3, 99, 100, 101, 42, 44, 46, 4, 5,
+ 6, 7, 8, 9, 14, 15, 16, 17, 18, 19,
+ 20, 21, 22, 23, 24, 25, 26, 27, 28, 29,
+ 30, 31, 32, 34, 35, 40, 118, 119, 120, 48,
+ 46, 41, 81, 43, 97, 43, 45, 43, 45, 3,
+ 42, 45, 48, 48, 42, 42, 48, 48, 48, 51,
+ 42, 50, 78, 103, 42, 46, 3, 42, 46, 97,
+ 98, 117, 117, 61, 94, 95, 124, 126, 129, 48,
+ 3, 43, 49, 114, 115, 117, 3, 36, 47, 112,
+ 117, 46, 42, 97, 45, 34, 43, 115, 3, 112,
+ 117, 117, 10, 11, 121, 122, 117, 117, 117, 117,
+ 117, 117, 117, 117, 117, 117, 117, 117, 117, 117,
+ 117, 117, 117, 117, 117, 117, 117, 117, 13, 117,
+ 117, 120, 119, 117, 43, 117, 117, 3, 3, 84,
+ 85, 95, 90, 91, 3, 86, 87, 85, 3, 27,
+ 88, 89, 85, 27, 89, 41, 87, 42, 43, 49,
+ 68, 107, 108, 109, 117, 40, 42, 104, 46, 97,
+ 43, 43, 42, 3, 48, 45, 34, 114, 43, 45,
+ 49, 117, 47, 36, 47, 47, 43, 107, 100, 102,
+ 104, 117, 43, 47, 47, 117, 12, 117, 5, 5,
+ 36, 117, 41, 45, 119, 117, 34, 43, 45, 43,
+ 45, 43, 3, 48, 45, 48, 43, 48, 48, 43,
+ 43, 107, 125, 109, 43, 45, 49, 95, 47, 41,
+ 45, 49, 102, 105, 106, 43, 107, 117, 123, 123,
+ 117, 36, 117, 127, 124, 117, 114, 114, 117, 125,
+ 43, 39, 117, 39, 117, 41, 117, 95, 3, 48,
+ 84, 48, 86, 48, 3, 88, 50, 48, 43, 125,
+ 109, 109, 3, 101, 102, 41, 49, 45, 125, 43,
+ 47, 60, 43, 117, 48, 125, 117, 39, 117, 41,
+ 45, 3, 89, 101, 34, 41, 102, 102, 125, 123,
+ 48, 43, 128, 129, 117, 117, 48, 48, 34, 102,
+ 41, 123, 43, 41, 102, 123
};
/* YYR1[RULE-NUM] -- Symbol kind of the left-hand side of rule RULE-NUM. */
-static const yytype_int8 yyr1[] =
+static const yytype_uint8 yyr1[] =
{
0, 76, 77, 78, 78, 79, 79, 80, 80, 80,
81, 81, 81, 81, 82, 82, 82, 82, 83, 83,
83, 83, 83, 83, 83, 83, 83, 83, 83, 83,
- 84, 84, 85, 85, 86, 86, 87, 87, 88, 88,
- 89, 90, 91, 91, 92, 93, 93, 94, 94, 95,
- 95, 96, 96, 97, 97, 97, 97, 98, 98, 99,
- 100, 100, 100, 100, 101, 101, 101, 102, 102, 103,
- 103, 103, 103, 104, 104, 105, 105, 105, 105, 105,
- 106, 106, 107, 107, 108, 108, 108, 108, 109, 109,
- 109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
- 110, 110, 111, 111, 111, 111, 112, 112, 113, 113,
- 113, 113, 113, 113, 113, 113, 113, 113, 113, 113,
- 113, 113, 113, 113, 113, 113, 113, 113, 113, 113,
- 113, 113, 113, 113, 113, 113, 113, 113, 113, 113,
- 113, 113, 113, 113, 113, 113, 113, 113, 113, 113,
- 113, 113, 113, 113, 113, 113, 113, 114, 114, 114,
- 114, 114, 115, 115, 115, 115, 116, 116, 116, 116,
- 116, 117, 117, 117, 117, 118, 118, 119, 119, 119,
- 119, 119, 119, 119, 119, 119, 119, 119, 119, 119,
- 120, 121, 122, 122, 122, 123, 123, 124, 124, 125,
- 125
+ 83, 83, 83, 83, 83, 83, 84, 84, 85, 85,
+ 86, 87, 87, 88, 88, 89, 89, 90, 90, 91,
+ 91, 92, 92, 93, 94, 95, 95, 96, 97, 97,
+ 98, 98, 99, 99, 100, 100, 101, 101, 101, 101,
+ 102, 102, 103, 104, 104, 104, 104, 105, 105, 105,
+ 106, 106, 107, 107, 107, 107, 108, 108, 109, 109,
+ 109, 109, 109, 110, 110, 111, 111, 112, 112, 112,
+ 112, 113, 113, 113, 113, 113, 113, 113, 113, 113,
+ 113, 113, 113, 114, 114, 115, 115, 115, 115, 116,
+ 116, 117, 117, 117, 117, 117, 117, 117, 117, 117,
+ 117, 117, 117, 117, 117, 117, 117, 117, 117, 117,
+ 117, 117, 117, 117, 117, 117, 117, 117, 117, 117,
+ 117, 117, 117, 117, 117, 117, 117, 117, 117, 117,
+ 117, 117, 117, 117, 117, 117, 117, 117, 117, 117,
+ 118, 118, 118, 118, 118, 119, 119, 119, 119, 120,
+ 120, 120, 120, 120, 121, 121, 121, 121, 122, 122,
+ 123, 123, 123, 123, 123, 123, 123, 123, 123, 123,
+ 123, 123, 123, 124, 125, 126, 126, 126, 127, 127,
+ 128, 128, 129, 129
};
/* YYR2[RULE-NUM] -- Number of symbols on the right-hand side of rule RULE-NUM. */
@@ -1336,24 +1361,25 @@ static const yytype_int8 yyr2[] =
0, 2, 1, 0, 2, 0, 2, 1, 3, 1,
1, 1, 2, 2, 1, 1, 2, 2, 1, 1,
1, 3, 5, 5, 3, 5, 5, 3, 3, 3,
- 1, 3, 1, 3, 1, 1, 1, 3, 1, 3,
- 2, 2, 1, 2, 1, 2, 3, 3, 4, 1,
- 3, 1, 3, 1, 2, 3, 4, 1, 1, 3,
- 2, 4, 3, 5, 1, 1, 2, 1, 3, 1,
- 2, 3, 3, 1, 0, 2, 3, 5, 4, 6,
- 5, 6, 3, 2, 1, 2, 2, 3, 3, 4,
- 4, 4, 4, 3, 4, 3, 4, 3, 3, 1,
- 1, 3, 1, 2, 3, 3, 3, 3, 1, 1,
- 1, 1, 2, 4, 5, 2, 2, 2, 3, 3,
+ 6, 6, 8, 6, 6, 8, 3, 1, 1, 3,
+ 1, 1, 3, 1, 3, 1, 3, 1, 1, 1,
+ 3, 1, 3, 2, 2, 1, 2, 1, 2, 3,
+ 3, 4, 1, 3, 1, 3, 1, 2, 3, 4,
+ 1, 1, 3, 2, 4, 3, 5, 1, 1, 2,
+ 1, 3, 1, 2, 3, 3, 1, 0, 2, 3,
+ 5, 4, 6, 5, 6, 3, 2, 1, 2, 2,
+ 3, 3, 4, 4, 4, 4, 3, 4, 3, 4,
+ 3, 3, 1, 1, 3, 1, 2, 3, 3, 3,
+ 3, 1, 1, 1, 1, 2, 4, 5, 2, 2,
+ 2, 3, 3, 3, 3, 3, 3, 3, 3, 3,
3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
- 3, 3, 3, 3, 3, 3, 3, 3, 2, 3,
- 4, 3, 4, 5, 6, 6, 7, 5, 3, 3,
- 3, 2, 2, 2, 2, 3, 4, 1, 1, 2,
- 2, 3, 4, 3, 5, 7, 1, 3, 3, 1,
- 1, 2, 4, 3, 5, 2, 4, 1, 1, 2,
- 5, 7, 5, 7, 9, 8, 2, 2, 2, 3,
- 1, 1, 0, 1, 1, 0, 1, 0, 1, 1,
- 3
+ 3, 2, 3, 4, 3, 4, 5, 6, 6, 7,
+ 5, 3, 3, 3, 2, 2, 2, 2, 3, 4,
+ 1, 1, 2, 2, 3, 4, 3, 5, 7, 1,
+ 3, 3, 1, 1, 2, 4, 3, 5, 2, 4,
+ 1, 1, 2, 5, 7, 5, 7, 9, 8, 2,
+ 2, 2, 3, 1, 1, 0, 1, 1, 0, 1,
+ 0, 1, 1, 3
};
@@ -1817,1232 +1843,1320 @@ yyreduce:
switch (yyn)
{
case 2: /* file: fileblock */
-#line 191 "camp.y"
+#line 195 "camp.y"
{ absyntax::root = (yyvsp[0].b); }
-#line 1823 "camp.tab.c"
+#line 1849 "camp.tab.c"
break;
case 3: /* fileblock: %empty */
-#line 195 "camp.y"
+#line 199 "camp.y"
{ (yyval.b) = new file(lexerPos(), false); }
-#line 1829 "camp.tab.c"
+#line 1855 "camp.tab.c"
break;
case 4: /* fileblock: fileblock runnable */
-#line 197 "camp.y"
+#line 201 "camp.y"
{ (yyval.b) = (yyvsp[-1].b); (yyval.b)->add((yyvsp[0].run)); }
-#line 1835 "camp.tab.c"
+#line 1861 "camp.tab.c"
break;
case 5: /* bareblock: %empty */
-#line 201 "camp.y"
+#line 205 "camp.y"
{ (yyval.b) = new block(lexerPos(), true); }
-#line 1841 "camp.tab.c"
+#line 1867 "camp.tab.c"
break;
case 6: /* bareblock: bareblock runnable */
-#line 203 "camp.y"
+#line 207 "camp.y"
{ (yyval.b) = (yyvsp[-1].b); (yyval.b)->add((yyvsp[0].run)); }
-#line 1847 "camp.tab.c"
+#line 1873 "camp.tab.c"
break;
case 7: /* name: ID */
-#line 207 "camp.y"
+#line 211 "camp.y"
{ (yyval.n) = new simpleName((yyvsp[0].ps).pos, (yyvsp[0].ps).sym); }
-#line 1853 "camp.tab.c"
+#line 1879 "camp.tab.c"
break;
case 8: /* name: name '.' ID */
-#line 208 "camp.y"
+#line 212 "camp.y"
{ (yyval.n) = new qualifiedName((yyvsp[-1].pos), (yyvsp[-2].n), (yyvsp[0].ps).sym); }
-#line 1859 "camp.tab.c"
+#line 1885 "camp.tab.c"
break;
case 9: /* name: '%' */
-#line 209 "camp.y"
+#line 213 "camp.y"
{ (yyval.n) = new simpleName((yyvsp[0].ps).pos,
symbol::trans("operator answer")); }
-#line 1866 "camp.tab.c"
+#line 1892 "camp.tab.c"
break;
case 10: /* runnable: dec */
-#line 214 "camp.y"
+#line 218 "camp.y"
{ (yyval.run) = (yyvsp[0].d); }
-#line 1872 "camp.tab.c"
+#line 1898 "camp.tab.c"
break;
case 11: /* runnable: stm */
-#line 215 "camp.y"
+#line 219 "camp.y"
{ (yyval.run) = (yyvsp[0].s); }
-#line 1878 "camp.tab.c"
+#line 1904 "camp.tab.c"
break;
case 12: /* runnable: modifiers dec */
-#line 217 "camp.y"
+#line 221 "camp.y"
{ (yyval.run) = new modifiedRunnable((yyvsp[-1].ml)->getPos(), (yyvsp[-1].ml), (yyvsp[0].d)); }
-#line 1884 "camp.tab.c"
+#line 1910 "camp.tab.c"
break;
case 13: /* runnable: modifiers stm */
-#line 219 "camp.y"
+#line 223 "camp.y"
{ (yyval.run) = new modifiedRunnable((yyvsp[-1].ml)->getPos(), (yyvsp[-1].ml), (yyvsp[0].s)); }
-#line 1890 "camp.tab.c"
+#line 1916 "camp.tab.c"
break;
case 14: /* modifiers: MODIFIER */
-#line 223 "camp.y"
+#line 227 "camp.y"
{ (yyval.ml) = new modifierList((yyvsp[0].mod).pos); (yyval.ml)->add((yyvsp[0].mod).val); }
-#line 1896 "camp.tab.c"
+#line 1922 "camp.tab.c"
break;
case 15: /* modifiers: PERM */
-#line 224 "camp.y"
+#line 228 "camp.y"
{ (yyval.ml) = new modifierList((yyvsp[0].perm).pos); (yyval.ml)->add((yyvsp[0].perm).val); }
-#line 1902 "camp.tab.c"
+#line 1928 "camp.tab.c"
break;
case 16: /* modifiers: modifiers MODIFIER */
-#line 226 "camp.y"
+#line 230 "camp.y"
{ (yyval.ml) = (yyvsp[-1].ml); (yyval.ml)->add((yyvsp[0].mod).val); }
-#line 1908 "camp.tab.c"
+#line 1934 "camp.tab.c"
break;
case 17: /* modifiers: modifiers PERM */
-#line 228 "camp.y"
+#line 232 "camp.y"
{ (yyval.ml) = (yyvsp[-1].ml); (yyval.ml)->add((yyvsp[0].perm).val); }
-#line 1914 "camp.tab.c"
+#line 1940 "camp.tab.c"
break;
case 18: /* dec: vardec */
-#line 232 "camp.y"
+#line 236 "camp.y"
{ (yyval.d) = (yyvsp[0].vd); }
-#line 1920 "camp.tab.c"
+#line 1946 "camp.tab.c"
break;
case 19: /* dec: fundec */
-#line 233 "camp.y"
+#line 237 "camp.y"
{ (yyval.d) = (yyvsp[0].d); }
-#line 1926 "camp.tab.c"
+#line 1952 "camp.tab.c"
break;
case 20: /* dec: typedec */
-#line 234 "camp.y"
+#line 238 "camp.y"
{ (yyval.d) = (yyvsp[0].d); }
-#line 1932 "camp.tab.c"
+#line 1958 "camp.tab.c"
break;
case 21: /* dec: ACCESS stridpairlist ';' */
-#line 236 "camp.y"
+#line 240 "camp.y"
{ (yyval.d) = new accessdec((yyvsp[-2].pos), (yyvsp[-1].ipl)); }
-#line 1938 "camp.tab.c"
+#line 1964 "camp.tab.c"
break;
case 22: /* dec: FROM name UNRAVEL idpairlist ';' */
-#line 238 "camp.y"
+#line 242 "camp.y"
{ (yyval.d) = new unraveldec((yyvsp[-4].pos), (yyvsp[-3].n), (yyvsp[-1].ipl)); }
-#line 1944 "camp.tab.c"
+#line 1970 "camp.tab.c"
break;
case 23: /* dec: FROM name UNRAVEL '*' ';' */
-#line 240 "camp.y"
+#line 244 "camp.y"
{ (yyval.d) = new unraveldec((yyvsp[-4].pos), (yyvsp[-3].n), WILDCARD); }
-#line 1950 "camp.tab.c"
+#line 1976 "camp.tab.c"
break;
case 24: /* dec: UNRAVEL name ';' */
-#line 241 "camp.y"
+#line 245 "camp.y"
{ (yyval.d) = new unraveldec((yyvsp[-2].pos), (yyvsp[-1].n), WILDCARD); }
-#line 1956 "camp.tab.c"
+#line 1982 "camp.tab.c"
break;
case 25: /* dec: FROM strid ACCESS idpairlist ';' */
-#line 243 "camp.y"
+#line 247 "camp.y"
{ (yyval.d) = new fromaccessdec((yyvsp[-4].pos), (yyvsp[-3].ps).sym, (yyvsp[-1].ipl)); }
-#line 1962 "camp.tab.c"
+#line 1988 "camp.tab.c"
break;
case 26: /* dec: FROM strid ACCESS '*' ';' */
-#line 245 "camp.y"
+#line 249 "camp.y"
{ (yyval.d) = new fromaccessdec((yyvsp[-4].pos), (yyvsp[-3].ps).sym, WILDCARD); }
-#line 1968 "camp.tab.c"
+#line 1994 "camp.tab.c"
break;
case 27: /* dec: IMPORT stridpair ';' */
-#line 247 "camp.y"
+#line 251 "camp.y"
{ (yyval.d) = new importdec((yyvsp[-2].pos), (yyvsp[-1].ip)); }
-#line 1974 "camp.tab.c"
+#line 2000 "camp.tab.c"
break;
case 28: /* dec: INCLUDE ID ';' */
-#line 248 "camp.y"
+#line 252 "camp.y"
{ (yyval.d) = new includedec((yyvsp[-2].pos), (yyvsp[-1].ps).sym); }
-#line 1980 "camp.tab.c"
+#line 2006 "camp.tab.c"
break;
case 29: /* dec: INCLUDE STRING ';' */
-#line 250 "camp.y"
+#line 254 "camp.y"
{ (yyval.d) = new includedec((yyvsp[-2].pos), (yyvsp[-1].stre)->getString()); }
-#line 1986 "camp.tab.c"
+#line 2012 "camp.tab.c"
break;
- case 30: /* idpair: ID */
-#line 254 "camp.y"
+ case 30: /* dec: TYPEDEF IMPORT '(' typeparamlist ')' ';' */
+#line 258 "camp.y"
+ { (yyval.d) = new receiveTypedefDec((yyvsp[-5].pos), (yyvsp[-2].tps)); }
+#line 2018 "camp.tab.c"
+ break;
+
+ case 31: /* dec: IMPORT TYPEDEF '(' typeparamlist ')' ';' */
+#line 260 "camp.y"
+ { (yyval.d) = new badDec((yyvsp[-5].pos), (yyvsp[-5].pos),
+ "Expected 'typedef import(<types>);'");
+ }
+#line 2026 "camp.tab.c"
+ break;
+
+ case 32: /* dec: ACCESS strid '(' decdeclist ')' ID ID ';' */
+#line 265 "camp.y"
+ { (yyval.d) = new templateAccessDec(
+ (yyvsp[-7].pos), (yyvsp[-6].ps).sym, (yyvsp[-4].fls), (yyvsp[-2].ps).sym, (yyvsp[-1].ps).sym, (yyvsp[-2].ps).pos
+ ); }
+#line 2034 "camp.tab.c"
+ break;
+
+ case 33: /* dec: ACCESS strid '(' decdeclist ')' ';' */
+#line 269 "camp.y"
+ { (yyval.d) = new badDec((yyvsp[-5].pos), (yyvsp[0].pos), "expected 'as'"); }
+#line 2040 "camp.tab.c"
+ break;
+
+ case 34: /* dec: IMPORT strid '(' decdeclist ')' ';' */
+#line 271 "camp.y"
+ { (yyval.d) = new badDec((yyvsp[-5].pos), (yyvsp[-5].pos),
+ "Parametrized imports disallowed to reduce naming "
+ "conflicts. Try "
+ "'access <module>(<type parameters>) as <newname>;'."
+ ); }
+#line 2050 "camp.tab.c"
+ break;
+
+ case 35: /* dec: FROM strid '(' decdeclist ')' ACCESS idpairlist ';' */
+#line 277 "camp.y"
+ { (yyval.d) = new fromaccessdec((yyvsp[-7].pos), (yyvsp[-6].ps).sym, (yyvsp[-1].ipl), (yyvsp[-4].fls)); }
+#line 2056 "camp.tab.c"
+ break;
+
+ case 36: /* decdec: ID ASSIGN type */
+#line 283 "camp.y"
+ { (yyval.fl) = new formal(
+ (yyvsp[-2].ps).pos, (yyvsp[0].t), new decidstart((yyvsp[-2].ps).pos, (yyvsp[-2].ps).sym)
+ ); }
+#line 2064 "camp.tab.c"
+ break;
+
+ case 37: /* decdec: type */
+#line 286 "camp.y"
+ { (yyval.fl) = new formal((yyvsp[0].t)->getPos(), (yyvsp[0].t), nullptr); }
+#line 2070 "camp.tab.c"
+ break;
+
+ case 38: /* decdeclist: decdec */
+#line 291 "camp.y"
+ { (yyval.fls) = new formals((yyvsp[0].fl)->getPos()); (yyval.fls)->add((yyvsp[0].fl)); }
+#line 2076 "camp.tab.c"
+ break;
+
+ case 39: /* decdeclist: decdeclist ',' decdec */
+#line 293 "camp.y"
+ { (yyval.fls) = (yyvsp[-2].fls); (yyval.fls)->add((yyvsp[0].fl)); }
+#line 2082 "camp.tab.c"
+ break;
+
+ case 40: /* typeparam: ID */
+#line 297 "camp.y"
+ { (yyval.tp) = new typeParam((yyvsp[0].ps).pos, (yyvsp[0].ps).sym); }
+#line 2088 "camp.tab.c"
+ break;
+
+ case 41: /* typeparamlist: typeparam */
+#line 302 "camp.y"
+ { (yyval.tps) = new typeParamList((yyvsp[0].tp)->getPos()); (yyval.tps)->add((yyvsp[0].tp)); }
+#line 2094 "camp.tab.c"
+ break;
+
+ case 42: /* typeparamlist: typeparamlist ',' typeparam */
+#line 304 "camp.y"
+ { (yyval.tps) = (yyvsp[-2].tps); (yyval.tps)->add((yyvsp[0].tp)); }
+#line 2100 "camp.tab.c"
+ break;
+
+ case 43: /* idpair: ID */
+#line 308 "camp.y"
{ (yyval.ip) = new idpair((yyvsp[0].ps).pos, (yyvsp[0].ps).sym); }
-#line 1992 "camp.tab.c"
+#line 2106 "camp.tab.c"
break;
- case 31: /* idpair: ID ID ID */
-#line 256 "camp.y"
+ case 44: /* idpair: ID ID ID */
+#line 310 "camp.y"
{ (yyval.ip) = new idpair((yyvsp[-2].ps).pos, (yyvsp[-2].ps).sym, (yyvsp[-1].ps).sym , (yyvsp[0].ps).sym); }
-#line 1998 "camp.tab.c"
+#line 2112 "camp.tab.c"
break;
- case 32: /* idpairlist: idpair */
-#line 260 "camp.y"
+ case 45: /* idpairlist: idpair */
+#line 314 "camp.y"
{ (yyval.ipl) = new idpairlist(); (yyval.ipl)->add((yyvsp[0].ip)); }
-#line 2004 "camp.tab.c"
+#line 2118 "camp.tab.c"
break;
- case 33: /* idpairlist: idpairlist ',' idpair */
-#line 262 "camp.y"
+ case 46: /* idpairlist: idpairlist ',' idpair */
+#line 316 "camp.y"
{ (yyval.ipl) = (yyvsp[-2].ipl); (yyval.ipl)->add((yyvsp[0].ip)); }
-#line 2010 "camp.tab.c"
+#line 2124 "camp.tab.c"
break;
- case 34: /* strid: ID */
-#line 266 "camp.y"
+ case 47: /* strid: ID */
+#line 320 "camp.y"
{ (yyval.ps) = (yyvsp[0].ps); }
-#line 2016 "camp.tab.c"
+#line 2130 "camp.tab.c"
break;
- case 35: /* strid: STRING */
-#line 267 "camp.y"
+ case 48: /* strid: STRING */
+#line 321 "camp.y"
{ (yyval.ps).pos = (yyvsp[0].stre)->getPos();
(yyval.ps).sym = symbol::literalTrans((yyvsp[0].stre)->getString()); }
-#line 2023 "camp.tab.c"
+#line 2137 "camp.tab.c"
break;
- case 36: /* stridpair: ID */
-#line 272 "camp.y"
+ case 49: /* stridpair: ID */
+#line 326 "camp.y"
{ (yyval.ip) = new idpair((yyvsp[0].ps).pos, (yyvsp[0].ps).sym); }
-#line 2029 "camp.tab.c"
+#line 2143 "camp.tab.c"
break;
- case 37: /* stridpair: strid ID ID */
-#line 274 "camp.y"
+ case 50: /* stridpair: strid ID ID */
+#line 328 "camp.y"
{ (yyval.ip) = new idpair((yyvsp[-2].ps).pos, (yyvsp[-2].ps).sym, (yyvsp[-1].ps).sym , (yyvsp[0].ps).sym); }
-#line 2035 "camp.tab.c"
+#line 2149 "camp.tab.c"
break;
- case 38: /* stridpairlist: stridpair */
-#line 278 "camp.y"
+ case 51: /* stridpairlist: stridpair */
+#line 332 "camp.y"
{ (yyval.ipl) = new idpairlist(); (yyval.ipl)->add((yyvsp[0].ip)); }
-#line 2041 "camp.tab.c"
+#line 2155 "camp.tab.c"
break;
- case 39: /* stridpairlist: stridpairlist ',' stridpair */
-#line 280 "camp.y"
+ case 52: /* stridpairlist: stridpairlist ',' stridpair */
+#line 334 "camp.y"
{ (yyval.ipl) = (yyvsp[-2].ipl); (yyval.ipl)->add((yyvsp[0].ip)); }
-#line 2047 "camp.tab.c"
+#line 2161 "camp.tab.c"
break;
- case 40: /* vardec: barevardec ';' */
-#line 284 "camp.y"
+ case 53: /* vardec: barevardec ';' */
+#line 338 "camp.y"
{ (yyval.vd) = (yyvsp[-1].vd); }
-#line 2053 "camp.tab.c"
+#line 2167 "camp.tab.c"
break;
- case 41: /* barevardec: type decidlist */
-#line 288 "camp.y"
+ case 54: /* barevardec: type decidlist */
+#line 342 "camp.y"
{ (yyval.vd) = new vardec((yyvsp[-1].t)->getPos(), (yyvsp[-1].t), (yyvsp[0].dil)); }
-#line 2059 "camp.tab.c"
+#line 2173 "camp.tab.c"
break;
- case 42: /* type: celltype */
-#line 292 "camp.y"
+ case 55: /* type: celltype */
+#line 346 "camp.y"
{ (yyval.t) = (yyvsp[0].t); }
-#line 2065 "camp.tab.c"
+#line 2179 "camp.tab.c"
break;
- case 43: /* type: name dims */
-#line 293 "camp.y"
+ case 56: /* type: name dims */
+#line 347 "camp.y"
{ (yyval.t) = new arrayTy((yyvsp[-1].n), (yyvsp[0].dim)); }
-#line 2071 "camp.tab.c"
+#line 2185 "camp.tab.c"
break;
- case 44: /* celltype: name */
-#line 297 "camp.y"
+ case 57: /* celltype: name */
+#line 351 "camp.y"
{ (yyval.t) = new nameTy((yyvsp[0].n)); }
-#line 2077 "camp.tab.c"
+#line 2191 "camp.tab.c"
break;
- case 45: /* dims: '[' ']' */
-#line 301 "camp.y"
+ case 58: /* dims: '[' ']' */
+#line 355 "camp.y"
{ (yyval.dim) = new dimensions((yyvsp[-1].pos)); }
-#line 2083 "camp.tab.c"
+#line 2197 "camp.tab.c"
break;
- case 46: /* dims: dims '[' ']' */
-#line 302 "camp.y"
+ case 59: /* dims: dims '[' ']' */
+#line 356 "camp.y"
{ (yyval.dim) = (yyvsp[-2].dim); (yyval.dim)->increase(); }
-#line 2089 "camp.tab.c"
+#line 2203 "camp.tab.c"
break;
- case 47: /* dimexps: '[' exp ']' */
-#line 306 "camp.y"
+ case 60: /* dimexps: '[' exp ']' */
+#line 360 "camp.y"
{ (yyval.elist) = new explist((yyvsp[-2].pos)); (yyval.elist)->add((yyvsp[-1].e)); }
-#line 2095 "camp.tab.c"
+#line 2209 "camp.tab.c"
break;
- case 48: /* dimexps: dimexps '[' exp ']' */
-#line 308 "camp.y"
+ case 61: /* dimexps: dimexps '[' exp ']' */
+#line 362 "camp.y"
{ (yyval.elist) = (yyvsp[-3].elist); (yyval.elist)->add((yyvsp[-1].e)); }
-#line 2101 "camp.tab.c"
+#line 2215 "camp.tab.c"
break;
- case 49: /* decidlist: decid */
-#line 312 "camp.y"
+ case 62: /* decidlist: decid */
+#line 366 "camp.y"
{ (yyval.dil) = new decidlist((yyvsp[0].di)->getPos()); (yyval.dil)->add((yyvsp[0].di)); }
-#line 2107 "camp.tab.c"
+#line 2221 "camp.tab.c"
break;
- case 50: /* decidlist: decidlist ',' decid */
-#line 314 "camp.y"
+ case 63: /* decidlist: decidlist ',' decid */
+#line 368 "camp.y"
{ (yyval.dil) = (yyvsp[-2].dil); (yyval.dil)->add((yyvsp[0].di)); }
-#line 2113 "camp.tab.c"
+#line 2227 "camp.tab.c"
break;
- case 51: /* decid: decidstart */
-#line 318 "camp.y"
+ case 64: /* decid: decidstart */
+#line 372 "camp.y"
{ (yyval.di) = new decid((yyvsp[0].dis)->getPos(), (yyvsp[0].dis)); }
-#line 2119 "camp.tab.c"
+#line 2233 "camp.tab.c"
break;
- case 52: /* decid: decidstart ASSIGN varinit */
-#line 320 "camp.y"
+ case 65: /* decid: decidstart ASSIGN varinit */
+#line 374 "camp.y"
{ (yyval.di) = new decid((yyvsp[-2].dis)->getPos(), (yyvsp[-2].dis), (yyvsp[0].vi)); }
-#line 2125 "camp.tab.c"
+#line 2239 "camp.tab.c"
break;
- case 53: /* decidstart: ID */
-#line 324 "camp.y"
+ case 66: /* decidstart: ID */
+#line 378 "camp.y"
{ (yyval.dis) = new decidstart((yyvsp[0].ps).pos, (yyvsp[0].ps).sym); }
-#line 2131 "camp.tab.c"
+#line 2245 "camp.tab.c"
break;
- case 54: /* decidstart: ID dims */
-#line 325 "camp.y"
+ case 67: /* decidstart: ID dims */
+#line 379 "camp.y"
{ (yyval.dis) = new decidstart((yyvsp[-1].ps).pos, (yyvsp[-1].ps).sym, (yyvsp[0].dim)); }
-#line 2137 "camp.tab.c"
+#line 2251 "camp.tab.c"
break;
- case 55: /* decidstart: ID '(' ')' */
-#line 326 "camp.y"
+ case 68: /* decidstart: ID '(' ')' */
+#line 380 "camp.y"
{ (yyval.dis) = new fundecidstart((yyvsp[-2].ps).pos, (yyvsp[-2].ps).sym, 0,
new formals((yyvsp[-1].pos))); }
-#line 2144 "camp.tab.c"
+#line 2258 "camp.tab.c"
break;
- case 56: /* decidstart: ID '(' formals ')' */
-#line 329 "camp.y"
+ case 69: /* decidstart: ID '(' formals ')' */
+#line 383 "camp.y"
{ (yyval.dis) = new fundecidstart((yyvsp[-3].ps).pos, (yyvsp[-3].ps).sym, 0, (yyvsp[-1].fls)); }
-#line 2150 "camp.tab.c"
+#line 2264 "camp.tab.c"
break;
- case 57: /* varinit: exp */
-#line 333 "camp.y"
+ case 70: /* varinit: exp */
+#line 387 "camp.y"
{ (yyval.vi) = (yyvsp[0].e); }
-#line 2156 "camp.tab.c"
+#line 2270 "camp.tab.c"
break;
- case 58: /* varinit: arrayinit */
-#line 334 "camp.y"
+ case 71: /* varinit: arrayinit */
+#line 388 "camp.y"
{ (yyval.vi) = (yyvsp[0].ai); }
-#line 2162 "camp.tab.c"
+#line 2276 "camp.tab.c"
break;
- case 59: /* block: '{' bareblock '}' */
-#line 339 "camp.y"
+ case 72: /* block: '{' bareblock '}' */
+#line 393 "camp.y"
{ (yyval.b) = (yyvsp[-1].b); }
-#line 2168 "camp.tab.c"
+#line 2282 "camp.tab.c"
break;
- case 60: /* arrayinit: '{' '}' */
-#line 343 "camp.y"
+ case 73: /* arrayinit: '{' '}' */
+#line 397 "camp.y"
{ (yyval.ai) = new arrayinit((yyvsp[-1].pos)); }
-#line 2174 "camp.tab.c"
+#line 2288 "camp.tab.c"
break;
- case 61: /* arrayinit: '{' ELLIPSIS varinit '}' */
-#line 345 "camp.y"
+ case 74: /* arrayinit: '{' ELLIPSIS varinit '}' */
+#line 399 "camp.y"
{ (yyval.ai) = new arrayinit((yyvsp[-3].pos)); (yyval.ai)->addRest((yyvsp[-1].vi)); }
-#line 2180 "camp.tab.c"
+#line 2294 "camp.tab.c"
break;
- case 62: /* arrayinit: '{' basearrayinit '}' */
-#line 347 "camp.y"
+ case 75: /* arrayinit: '{' basearrayinit '}' */
+#line 401 "camp.y"
{ (yyval.ai) = (yyvsp[-1].ai); }
-#line 2186 "camp.tab.c"
+#line 2300 "camp.tab.c"
break;
- case 63: /* arrayinit: '{' basearrayinit ELLIPSIS varinit '}' */
-#line 349 "camp.y"
+ case 76: /* arrayinit: '{' basearrayinit ELLIPSIS varinit '}' */
+#line 403 "camp.y"
{ (yyval.ai) = (yyvsp[-3].ai); (yyval.ai)->addRest((yyvsp[-1].vi)); }
-#line 2192 "camp.tab.c"
+#line 2306 "camp.tab.c"
break;
- case 64: /* basearrayinit: ',' */
-#line 353 "camp.y"
+ case 77: /* basearrayinit: ',' */
+#line 407 "camp.y"
{ (yyval.ai) = new arrayinit((yyvsp[0].pos)); }
-#line 2198 "camp.tab.c"
+#line 2312 "camp.tab.c"
break;
- case 65: /* basearrayinit: varinits */
-#line 354 "camp.y"
+ case 78: /* basearrayinit: varinits */
+#line 408 "camp.y"
{ (yyval.ai) = (yyvsp[0].ai); }
-#line 2204 "camp.tab.c"
+#line 2318 "camp.tab.c"
break;
- case 66: /* basearrayinit: varinits ',' */
-#line 355 "camp.y"
+ case 79: /* basearrayinit: varinits ',' */
+#line 409 "camp.y"
{ (yyval.ai) = (yyvsp[-1].ai); }
-#line 2210 "camp.tab.c"
+#line 2324 "camp.tab.c"
break;
- case 67: /* varinits: varinit */
-#line 359 "camp.y"
+ case 80: /* varinits: varinit */
+#line 413 "camp.y"
{ (yyval.ai) = new arrayinit((yyvsp[0].vi)->getPos());
(yyval.ai)->add((yyvsp[0].vi));}
-#line 2217 "camp.tab.c"
+#line 2331 "camp.tab.c"
break;
- case 68: /* varinits: varinits ',' varinit */
-#line 362 "camp.y"
+ case 81: /* varinits: varinits ',' varinit */
+#line 416 "camp.y"
{ (yyval.ai) = (yyvsp[-2].ai); (yyval.ai)->add((yyvsp[0].vi)); }
-#line 2223 "camp.tab.c"
+#line 2337 "camp.tab.c"
break;
- case 69: /* formals: formal */
-#line 366 "camp.y"
+ case 82: /* formals: formal */
+#line 420 "camp.y"
{ (yyval.fls) = new formals((yyvsp[0].fl)->getPos()); (yyval.fls)->add((yyvsp[0].fl)); }
-#line 2229 "camp.tab.c"
+#line 2343 "camp.tab.c"
break;
- case 70: /* formals: ELLIPSIS formal */
-#line 367 "camp.y"
+ case 83: /* formals: ELLIPSIS formal */
+#line 421 "camp.y"
{ (yyval.fls) = new formals((yyvsp[-1].pos)); (yyval.fls)->addRest((yyvsp[0].fl)); }
-#line 2235 "camp.tab.c"
+#line 2349 "camp.tab.c"
break;
- case 71: /* formals: formals ',' formal */
-#line 369 "camp.y"
+ case 84: /* formals: formals ',' formal */
+#line 423 "camp.y"
{ (yyval.fls) = (yyvsp[-2].fls); (yyval.fls)->add((yyvsp[0].fl)); }
-#line 2241 "camp.tab.c"
+#line 2355 "camp.tab.c"
break;
- case 72: /* formals: formals ELLIPSIS formal */
-#line 371 "camp.y"
+ case 85: /* formals: formals ELLIPSIS formal */
+#line 425 "camp.y"
{ (yyval.fls) = (yyvsp[-2].fls); (yyval.fls)->addRest((yyvsp[0].fl)); }
-#line 2247 "camp.tab.c"
+#line 2361 "camp.tab.c"
break;
- case 73: /* explicitornot: EXPLICIT */
-#line 375 "camp.y"
+ case 86: /* explicitornot: EXPLICIT */
+#line 429 "camp.y"
{ (yyval.boo) = true; }
-#line 2253 "camp.tab.c"
+#line 2367 "camp.tab.c"
break;
- case 74: /* explicitornot: %empty */
-#line 376 "camp.y"
+ case 87: /* explicitornot: %empty */
+#line 430 "camp.y"
{ (yyval.boo) = false; }
-#line 2259 "camp.tab.c"
+#line 2373 "camp.tab.c"
break;
- case 75: /* formal: explicitornot type */
-#line 381 "camp.y"
+ case 88: /* formal: explicitornot type */
+#line 435 "camp.y"
{ (yyval.fl) = new formal((yyvsp[0].t)->getPos(), (yyvsp[0].t), 0, 0, (yyvsp[-1].boo), 0); }
-#line 2265 "camp.tab.c"
+#line 2379 "camp.tab.c"
break;
- case 76: /* formal: explicitornot type decidstart */
-#line 383 "camp.y"
+ case 89: /* formal: explicitornot type decidstart */
+#line 437 "camp.y"
{ (yyval.fl) = new formal((yyvsp[-1].t)->getPos(), (yyvsp[-1].t), (yyvsp[0].dis), 0, (yyvsp[-2].boo), 0); }
-#line 2271 "camp.tab.c"
+#line 2385 "camp.tab.c"
break;
- case 77: /* formal: explicitornot type decidstart ASSIGN varinit */
-#line 385 "camp.y"
+ case 90: /* formal: explicitornot type decidstart ASSIGN varinit */
+#line 439 "camp.y"
{ (yyval.fl) = new formal((yyvsp[-3].t)->getPos(), (yyvsp[-3].t), (yyvsp[-2].dis), (yyvsp[0].vi), (yyvsp[-4].boo), 0); }
-#line 2277 "camp.tab.c"
+#line 2391 "camp.tab.c"
break;
- case 78: /* formal: explicitornot type ID decidstart */
-#line 388 "camp.y"
+ case 91: /* formal: explicitornot type ID decidstart */
+#line 442 "camp.y"
{ bool k = checkKeyword((yyvsp[-1].ps).pos, (yyvsp[-1].ps).sym);
(yyval.fl) = new formal((yyvsp[-2].t)->getPos(), (yyvsp[-2].t), (yyvsp[0].dis), 0, (yyvsp[-3].boo), k); }
-#line 2284 "camp.tab.c"
+#line 2398 "camp.tab.c"
break;
- case 79: /* formal: explicitornot type ID decidstart ASSIGN varinit */
-#line 391 "camp.y"
+ case 92: /* formal: explicitornot type ID decidstart ASSIGN varinit */
+#line 445 "camp.y"
{ bool k = checkKeyword((yyvsp[-3].ps).pos, (yyvsp[-3].ps).sym);
(yyval.fl) = new formal((yyvsp[-4].t)->getPos(), (yyvsp[-4].t), (yyvsp[-2].dis), (yyvsp[0].vi), (yyvsp[-5].boo), k); }
-#line 2291 "camp.tab.c"
+#line 2405 "camp.tab.c"
break;
- case 80: /* fundec: type ID '(' ')' blockstm */
-#line 397 "camp.y"
+ case 93: /* fundec: type ID '(' ')' blockstm */
+#line 451 "camp.y"
{ (yyval.d) = new fundec((yyvsp[-2].pos), (yyvsp[-4].t), (yyvsp[-3].ps).sym, new formals((yyvsp[-2].pos)), (yyvsp[0].s)); }
-#line 2297 "camp.tab.c"
+#line 2411 "camp.tab.c"
break;
- case 81: /* fundec: type ID '(' formals ')' blockstm */
-#line 399 "camp.y"
+ case 94: /* fundec: type ID '(' formals ')' blockstm */
+#line 453 "camp.y"
{ (yyval.d) = new fundec((yyvsp[-3].pos), (yyvsp[-5].t), (yyvsp[-4].ps).sym, (yyvsp[-2].fls), (yyvsp[0].s)); }
-#line 2303 "camp.tab.c"
+#line 2417 "camp.tab.c"
break;
- case 82: /* typedec: STRUCT ID block */
-#line 403 "camp.y"
+ case 95: /* typedec: STRUCT ID block */
+#line 457 "camp.y"
{ (yyval.d) = new recorddec((yyvsp[-2].pos), (yyvsp[-1].ps).sym, (yyvsp[0].b)); }
-#line 2309 "camp.tab.c"
+#line 2423 "camp.tab.c"
break;
- case 83: /* typedec: TYPEDEF vardec */
-#line 404 "camp.y"
+ case 96: /* typedec: TYPEDEF vardec */
+#line 458 "camp.y"
{ (yyval.d) = new typedec((yyvsp[-1].pos), (yyvsp[0].vd)); }
-#line 2315 "camp.tab.c"
+#line 2429 "camp.tab.c"
break;
- case 84: /* slice: ':' */
-#line 408 "camp.y"
+ case 97: /* slice: ':' */
+#line 462 "camp.y"
{ (yyval.slice) = new slice((yyvsp[0].pos), 0, 0); }
-#line 2321 "camp.tab.c"
+#line 2435 "camp.tab.c"
break;
- case 85: /* slice: exp ':' */
-#line 409 "camp.y"
+ case 98: /* slice: exp ':' */
+#line 463 "camp.y"
{ (yyval.slice) = new slice((yyvsp[0].pos), (yyvsp[-1].e), 0); }
-#line 2327 "camp.tab.c"
+#line 2441 "camp.tab.c"
break;
- case 86: /* slice: ':' exp */
-#line 410 "camp.y"
+ case 99: /* slice: ':' exp */
+#line 464 "camp.y"
{ (yyval.slice) = new slice((yyvsp[-1].pos), 0, (yyvsp[0].e)); }
-#line 2333 "camp.tab.c"
+#line 2447 "camp.tab.c"
break;
- case 87: /* slice: exp ':' exp */
-#line 411 "camp.y"
+ case 100: /* slice: exp ':' exp */
+#line 465 "camp.y"
{ (yyval.slice) = new slice((yyvsp[-1].pos), (yyvsp[-2].e), (yyvsp[0].e)); }
-#line 2339 "camp.tab.c"
+#line 2453 "camp.tab.c"
break;
- case 88: /* value: value '.' ID */
-#line 415 "camp.y"
+ case 101: /* value: value '.' ID */
+#line 469 "camp.y"
{ (yyval.e) = new fieldExp((yyvsp[-1].pos), (yyvsp[-2].e), (yyvsp[0].ps).sym); }
-#line 2345 "camp.tab.c"
+#line 2459 "camp.tab.c"
break;
- case 89: /* value: name '[' exp ']' */
-#line 416 "camp.y"
+ case 102: /* value: name '[' exp ']' */
+#line 470 "camp.y"
{ (yyval.e) = new subscriptExp((yyvsp[-2].pos),
new nameExp((yyvsp[-3].n)->getPos(), (yyvsp[-3].n)), (yyvsp[-1].e)); }
-#line 2352 "camp.tab.c"
+#line 2466 "camp.tab.c"
break;
- case 90: /* value: value '[' exp ']' */
-#line 418 "camp.y"
+ case 103: /* value: value '[' exp ']' */
+#line 472 "camp.y"
{ (yyval.e) = new subscriptExp((yyvsp[-2].pos), (yyvsp[-3].e), (yyvsp[-1].e)); }
-#line 2358 "camp.tab.c"
+#line 2472 "camp.tab.c"
break;
- case 91: /* value: name '[' slice ']' */
-#line 419 "camp.y"
+ case 104: /* value: name '[' slice ']' */
+#line 473 "camp.y"
{ (yyval.e) = new sliceExp((yyvsp[-2].pos),
new nameExp((yyvsp[-3].n)->getPos(), (yyvsp[-3].n)), (yyvsp[-1].slice)); }
-#line 2365 "camp.tab.c"
+#line 2479 "camp.tab.c"
break;
- case 92: /* value: value '[' slice ']' */
-#line 421 "camp.y"
+ case 105: /* value: value '[' slice ']' */
+#line 475 "camp.y"
{ (yyval.e) = new sliceExp((yyvsp[-2].pos), (yyvsp[-3].e), (yyvsp[-1].slice)); }
-#line 2371 "camp.tab.c"
+#line 2485 "camp.tab.c"
break;
- case 93: /* value: name '(' ')' */
-#line 422 "camp.y"
+ case 106: /* value: name '(' ')' */
+#line 476 "camp.y"
{ (yyval.e) = new callExp((yyvsp[-1].pos),
new nameExp((yyvsp[-2].n)->getPos(), (yyvsp[-2].n)),
new arglist()); }
-#line 2379 "camp.tab.c"
+#line 2493 "camp.tab.c"
break;
- case 94: /* value: name '(' arglist ')' */
-#line 426 "camp.y"
- { (yyval.e) = new callExp((yyvsp[-2].pos),
+ case 107: /* value: name '(' arglist ')' */
+#line 480 "camp.y"
+ { (yyval.e) = new callExp((yyvsp[-2].pos),
new nameExp((yyvsp[-3].n)->getPos(), (yyvsp[-3].n)),
(yyvsp[-1].alist)); }
-#line 2387 "camp.tab.c"
+#line 2501 "camp.tab.c"
break;
- case 95: /* value: value '(' ')' */
-#line 429 "camp.y"
+ case 108: /* value: value '(' ')' */
+#line 483 "camp.y"
{ (yyval.e) = new callExp((yyvsp[-1].pos), (yyvsp[-2].e), new arglist()); }
-#line 2393 "camp.tab.c"
+#line 2507 "camp.tab.c"
break;
- case 96: /* value: value '(' arglist ')' */
-#line 431 "camp.y"
+ case 109: /* value: value '(' arglist ')' */
+#line 485 "camp.y"
{ (yyval.e) = new callExp((yyvsp[-2].pos), (yyvsp[-3].e), (yyvsp[-1].alist)); }
-#line 2399 "camp.tab.c"
+#line 2513 "camp.tab.c"
break;
- case 97: /* value: '(' exp ')' */
-#line 433 "camp.y"
+ case 110: /* value: '(' exp ')' */
+#line 487 "camp.y"
{ (yyval.e) = (yyvsp[-1].e); }
-#line 2405 "camp.tab.c"
+#line 2519 "camp.tab.c"
break;
- case 98: /* value: '(' name ')' */
-#line 435 "camp.y"
+ case 111: /* value: '(' name ')' */
+#line 489 "camp.y"
{ (yyval.e) = new nameExp((yyvsp[-1].n)->getPos(), (yyvsp[-1].n)); }
-#line 2411 "camp.tab.c"
+#line 2525 "camp.tab.c"
break;
- case 99: /* value: THIS */
-#line 436 "camp.y"
+ case 112: /* value: THIS */
+#line 490 "camp.y"
{ (yyval.e) = new thisExp((yyvsp[0].pos)); }
-#line 2417 "camp.tab.c"
+#line 2531 "camp.tab.c"
break;
- case 100: /* argument: exp */
-#line 440 "camp.y"
+ case 113: /* argument: exp */
+#line 494 "camp.y"
{ (yyval.arg).name = symbol::nullsym; (yyval.arg).val=(yyvsp[0].e); }
-#line 2423 "camp.tab.c"
+#line 2537 "camp.tab.c"
break;
- case 101: /* argument: ID ASSIGN exp */
-#line 441 "camp.y"
+ case 114: /* argument: ID ASSIGN exp */
+#line 495 "camp.y"
{ (yyval.arg).name = (yyvsp[-2].ps).sym; (yyval.arg).val=(yyvsp[0].e); }
-#line 2429 "camp.tab.c"
+#line 2543 "camp.tab.c"
break;
- case 102: /* arglist: argument */
-#line 445 "camp.y"
+ case 115: /* arglist: argument */
+#line 499 "camp.y"
{ (yyval.alist) = new arglist(); (yyval.alist)->add((yyvsp[0].arg)); }
-#line 2435 "camp.tab.c"
+#line 2549 "camp.tab.c"
break;
- case 103: /* arglist: ELLIPSIS argument */
-#line 447 "camp.y"
+ case 116: /* arglist: ELLIPSIS argument */
+#line 501 "camp.y"
{ (yyval.alist) = new arglist(); (yyval.alist)->addRest((yyvsp[0].arg)); }
-#line 2441 "camp.tab.c"
+#line 2555 "camp.tab.c"
break;
- case 104: /* arglist: arglist ',' argument */
-#line 449 "camp.y"
+ case 117: /* arglist: arglist ',' argument */
+#line 503 "camp.y"
{ (yyval.alist) = (yyvsp[-2].alist); (yyval.alist)->add((yyvsp[0].arg)); }
-#line 2447 "camp.tab.c"
+#line 2561 "camp.tab.c"
break;
- case 105: /* arglist: arglist ELLIPSIS argument */
-#line 451 "camp.y"
+ case 118: /* arglist: arglist ELLIPSIS argument */
+#line 505 "camp.y"
{ (yyval.alist) = (yyvsp[-2].alist); (yyval.alist)->addRest((yyvsp[0].arg)); }
-#line 2453 "camp.tab.c"
+#line 2567 "camp.tab.c"
break;
- case 106: /* tuple: exp ',' exp */
-#line 456 "camp.y"
+ case 119: /* tuple: exp ',' exp */
+#line 510 "camp.y"
{ (yyval.alist) = new arglist(); (yyval.alist)->add((yyvsp[-2].e)); (yyval.alist)->add((yyvsp[0].e)); }
-#line 2459 "camp.tab.c"
+#line 2573 "camp.tab.c"
break;
- case 107: /* tuple: tuple ',' exp */
-#line 457 "camp.y"
+ case 120: /* tuple: tuple ',' exp */
+#line 511 "camp.y"
{ (yyval.alist) = (yyvsp[-2].alist); (yyval.alist)->add((yyvsp[0].e)); }
-#line 2465 "camp.tab.c"
+#line 2579 "camp.tab.c"
break;
- case 108: /* exp: name */
-#line 461 "camp.y"
+ case 121: /* exp: name */
+#line 515 "camp.y"
{ (yyval.e) = new nameExp((yyvsp[0].n)->getPos(), (yyvsp[0].n)); }
-#line 2471 "camp.tab.c"
+#line 2585 "camp.tab.c"
break;
- case 109: /* exp: value */
-#line 462 "camp.y"
+ case 122: /* exp: value */
+#line 516 "camp.y"
{ (yyval.e) = (yyvsp[0].e); }
-#line 2477 "camp.tab.c"
+#line 2591 "camp.tab.c"
break;
- case 110: /* exp: LIT */
-#line 463 "camp.y"
+ case 123: /* exp: LIT */
+#line 517 "camp.y"
{ (yyval.e) = (yyvsp[0].e); }
-#line 2483 "camp.tab.c"
+#line 2597 "camp.tab.c"
break;
- case 111: /* exp: STRING */
-#line 464 "camp.y"
+ case 124: /* exp: STRING */
+#line 518 "camp.y"
{ (yyval.e) = (yyvsp[0].stre); }
-#line 2489 "camp.tab.c"
+#line 2603 "camp.tab.c"
break;
- case 112: /* exp: LIT exp */
-#line 466 "camp.y"
+ case 125: /* exp: LIT exp */
+#line 520 "camp.y"
{ (yyval.e) = new scaleExp((yyvsp[-1].e)->getPos(), (yyvsp[-1].e), (yyvsp[0].e)); }
-#line 2495 "camp.tab.c"
+#line 2609 "camp.tab.c"
break;
- case 113: /* exp: '(' name ')' exp */
-#line 468 "camp.y"
+ case 126: /* exp: '(' name ')' exp */
+#line 522 "camp.y"
{ (yyval.e) = new castExp((yyvsp[-2].n)->getPos(), new nameTy((yyvsp[-2].n)), (yyvsp[0].e)); }
-#line 2501 "camp.tab.c"
+#line 2615 "camp.tab.c"
break;
- case 114: /* exp: '(' name dims ')' exp */
-#line 470 "camp.y"
+ case 127: /* exp: '(' name dims ')' exp */
+#line 524 "camp.y"
{ (yyval.e) = new castExp((yyvsp[-3].n)->getPos(), new arrayTy((yyvsp[-3].n), (yyvsp[-2].dim)), (yyvsp[0].e)); }
-#line 2507 "camp.tab.c"
+#line 2621 "camp.tab.c"
break;
- case 115: /* exp: '+' exp */
-#line 472 "camp.y"
+ case 128: /* exp: '+' exp */
+#line 526 "camp.y"
{ (yyval.e) = new unaryExp((yyvsp[-1].ps).pos, (yyvsp[0].e), (yyvsp[-1].ps).sym); }
-#line 2513 "camp.tab.c"
+#line 2627 "camp.tab.c"
break;
- case 116: /* exp: '-' exp */
-#line 474 "camp.y"
+ case 129: /* exp: '-' exp */
+#line 528 "camp.y"
{ (yyval.e) = new unaryExp((yyvsp[-1].ps).pos, (yyvsp[0].e), (yyvsp[-1].ps).sym); }
-#line 2519 "camp.tab.c"
+#line 2633 "camp.tab.c"
break;
- case 117: /* exp: OPERATOR exp */
-#line 475 "camp.y"
+ case 130: /* exp: OPERATOR exp */
+#line 529 "camp.y"
{ (yyval.e) = new unaryExp((yyvsp[-1].ps).pos, (yyvsp[0].e), (yyvsp[-1].ps).sym); }
-#line 2525 "camp.tab.c"
+#line 2639 "camp.tab.c"
break;
- case 118: /* exp: exp '+' exp */
-#line 476 "camp.y"
+ case 131: /* exp: exp '+' exp */
+#line 530 "camp.y"
{ (yyval.e) = new binaryExp((yyvsp[-1].ps).pos, (yyvsp[-2].e), (yyvsp[-1].ps).sym, (yyvsp[0].e)); }
-#line 2531 "camp.tab.c"
+#line 2645 "camp.tab.c"
break;
- case 119: /* exp: exp '-' exp */
-#line 477 "camp.y"
+ case 132: /* exp: exp '-' exp */
+#line 531 "camp.y"
{ (yyval.e) = new binaryExp((yyvsp[-1].ps).pos, (yyvsp[-2].e), (yyvsp[-1].ps).sym, (yyvsp[0].e)); }
-#line 2537 "camp.tab.c"
+#line 2651 "camp.tab.c"
break;
- case 120: /* exp: exp '*' exp */
-#line 478 "camp.y"
+ case 133: /* exp: exp '*' exp */
+#line 532 "camp.y"
{ (yyval.e) = new binaryExp((yyvsp[-1].ps).pos, (yyvsp[-2].e), (yyvsp[-1].ps).sym, (yyvsp[0].e)); }
-#line 2543 "camp.tab.c"
+#line 2657 "camp.tab.c"
break;
- case 121: /* exp: exp '/' exp */
-#line 479 "camp.y"
+ case 134: /* exp: exp '/' exp */
+#line 533 "camp.y"
{ (yyval.e) = new binaryExp((yyvsp[-1].ps).pos, (yyvsp[-2].e), (yyvsp[-1].ps).sym, (yyvsp[0].e)); }
-#line 2549 "camp.tab.c"
+#line 2663 "camp.tab.c"
break;
- case 122: /* exp: exp '%' exp */
-#line 480 "camp.y"
+ case 135: /* exp: exp '%' exp */
+#line 534 "camp.y"
{ (yyval.e) = new binaryExp((yyvsp[-1].ps).pos, (yyvsp[-2].e), (yyvsp[-1].ps).sym, (yyvsp[0].e)); }
-#line 2555 "camp.tab.c"
+#line 2669 "camp.tab.c"
break;
- case 123: /* exp: exp '#' exp */
-#line 481 "camp.y"
+ case 136: /* exp: exp '#' exp */
+#line 535 "camp.y"
{ (yyval.e) = new binaryExp((yyvsp[-1].ps).pos, (yyvsp[-2].e), (yyvsp[-1].ps).sym, (yyvsp[0].e)); }
-#line 2561 "camp.tab.c"
+#line 2675 "camp.tab.c"
break;
- case 124: /* exp: exp '^' exp */
-#line 482 "camp.y"
+ case 137: /* exp: exp '^' exp */
+#line 536 "camp.y"
{ (yyval.e) = new binaryExp((yyvsp[-1].ps).pos, (yyvsp[-2].e), (yyvsp[-1].ps).sym, (yyvsp[0].e)); }
-#line 2567 "camp.tab.c"
+#line 2681 "camp.tab.c"
break;
- case 125: /* exp: exp LT exp */
-#line 483 "camp.y"
+ case 138: /* exp: exp LT exp */
+#line 537 "camp.y"
{ (yyval.e) = new binaryExp((yyvsp[-1].ps).pos, (yyvsp[-2].e), (yyvsp[-1].ps).sym, (yyvsp[0].e)); }
-#line 2573 "camp.tab.c"
+#line 2687 "camp.tab.c"
break;
- case 126: /* exp: exp LE exp */
-#line 484 "camp.y"
+ case 139: /* exp: exp LE exp */
+#line 538 "camp.y"
{ (yyval.e) = new binaryExp((yyvsp[-1].ps).pos, (yyvsp[-2].e), (yyvsp[-1].ps).sym, (yyvsp[0].e)); }
-#line 2579 "camp.tab.c"
+#line 2693 "camp.tab.c"
break;
- case 127: /* exp: exp GT exp */
-#line 485 "camp.y"
+ case 140: /* exp: exp GT exp */
+#line 539 "camp.y"
{ (yyval.e) = new binaryExp((yyvsp[-1].ps).pos, (yyvsp[-2].e), (yyvsp[-1].ps).sym, (yyvsp[0].e)); }
-#line 2585 "camp.tab.c"
+#line 2699 "camp.tab.c"
break;
- case 128: /* exp: exp GE exp */
-#line 486 "camp.y"
+ case 141: /* exp: exp GE exp */
+#line 540 "camp.y"
{ (yyval.e) = new binaryExp((yyvsp[-1].ps).pos, (yyvsp[-2].e), (yyvsp[-1].ps).sym, (yyvsp[0].e)); }
-#line 2591 "camp.tab.c"
+#line 2705 "camp.tab.c"
break;
- case 129: /* exp: exp EQ exp */
-#line 487 "camp.y"
+ case 142: /* exp: exp EQ exp */
+#line 541 "camp.y"
{ (yyval.e) = new equalityExp((yyvsp[-1].ps).pos, (yyvsp[-2].e), (yyvsp[-1].ps).sym, (yyvsp[0].e)); }
-#line 2597 "camp.tab.c"
+#line 2711 "camp.tab.c"
break;
- case 130: /* exp: exp NEQ exp */
-#line 488 "camp.y"
+ case 143: /* exp: exp NEQ exp */
+#line 542 "camp.y"
{ (yyval.e) = new equalityExp((yyvsp[-1].ps).pos, (yyvsp[-2].e), (yyvsp[-1].ps).sym, (yyvsp[0].e)); }
-#line 2603 "camp.tab.c"
+#line 2717 "camp.tab.c"
break;
- case 131: /* exp: exp CAND exp */
-#line 489 "camp.y"
+ case 144: /* exp: exp CAND exp */
+#line 543 "camp.y"
{ (yyval.e) = new andExp((yyvsp[-1].ps).pos, (yyvsp[-2].e), (yyvsp[-1].ps).sym, (yyvsp[0].e)); }
-#line 2609 "camp.tab.c"
+#line 2723 "camp.tab.c"
break;
- case 132: /* exp: exp COR exp */
-#line 490 "camp.y"
+ case 145: /* exp: exp COR exp */
+#line 544 "camp.y"
{ (yyval.e) = new orExp((yyvsp[-1].ps).pos, (yyvsp[-2].e), (yyvsp[-1].ps).sym, (yyvsp[0].e)); }
-#line 2615 "camp.tab.c"
+#line 2729 "camp.tab.c"
break;
- case 133: /* exp: exp CARETS exp */
-#line 491 "camp.y"
+ case 146: /* exp: exp CARETS exp */
+#line 545 "camp.y"
{ (yyval.e) = new binaryExp((yyvsp[-1].ps).pos, (yyvsp[-2].e), (yyvsp[-1].ps).sym, (yyvsp[0].e)); }
-#line 2621 "camp.tab.c"
+#line 2735 "camp.tab.c"
break;
- case 134: /* exp: exp AMPERSAND exp */
-#line 492 "camp.y"
+ case 147: /* exp: exp AMPERSAND exp */
+#line 546 "camp.y"
{ (yyval.e) = new binaryExp((yyvsp[-1].ps).pos, (yyvsp[-2].e), (yyvsp[-1].ps).sym, (yyvsp[0].e)); }
-#line 2627 "camp.tab.c"
+#line 2741 "camp.tab.c"
break;
- case 135: /* exp: exp BAR exp */
-#line 493 "camp.y"
+ case 148: /* exp: exp BAR exp */
+#line 547 "camp.y"
{ (yyval.e) = new binaryExp((yyvsp[-1].ps).pos, (yyvsp[-2].e), (yyvsp[-1].ps).sym, (yyvsp[0].e)); }
-#line 2633 "camp.tab.c"
+#line 2747 "camp.tab.c"
break;
- case 136: /* exp: exp OPERATOR exp */
-#line 494 "camp.y"
+ case 149: /* exp: exp OPERATOR exp */
+#line 548 "camp.y"
{ (yyval.e) = new binaryExp((yyvsp[-1].ps).pos, (yyvsp[-2].e), (yyvsp[-1].ps).sym, (yyvsp[0].e)); }
-#line 2639 "camp.tab.c"
+#line 2753 "camp.tab.c"
break;
- case 137: /* exp: exp INCR exp */
-#line 495 "camp.y"
+ case 150: /* exp: exp INCR exp */
+#line 549 "camp.y"
{ (yyval.e) = new binaryExp((yyvsp[-1].ps).pos, (yyvsp[-2].e), (yyvsp[-1].ps).sym, (yyvsp[0].e)); }
-#line 2645 "camp.tab.c"
+#line 2759 "camp.tab.c"
break;
- case 138: /* exp: NEW celltype */
-#line 497 "camp.y"
+ case 151: /* exp: NEW celltype */
+#line 551 "camp.y"
{ (yyval.e) = new newRecordExp((yyvsp[-1].pos), (yyvsp[0].t)); }
-#line 2651 "camp.tab.c"
+#line 2765 "camp.tab.c"
break;
- case 139: /* exp: NEW celltype dimexps */
-#line 499 "camp.y"
+ case 152: /* exp: NEW celltype dimexps */
+#line 553 "camp.y"
{ (yyval.e) = new newArrayExp((yyvsp[-2].pos), (yyvsp[-1].t), (yyvsp[0].elist), 0, 0); }
-#line 2657 "camp.tab.c"
+#line 2771 "camp.tab.c"
break;
- case 140: /* exp: NEW celltype dimexps dims */
-#line 501 "camp.y"
+ case 153: /* exp: NEW celltype dimexps dims */
+#line 555 "camp.y"
{ (yyval.e) = new newArrayExp((yyvsp[-3].pos), (yyvsp[-2].t), (yyvsp[-1].elist), (yyvsp[0].dim), 0); }
-#line 2663 "camp.tab.c"
+#line 2777 "camp.tab.c"
break;
- case 141: /* exp: NEW celltype dims */
-#line 503 "camp.y"
+ case 154: /* exp: NEW celltype dims */
+#line 557 "camp.y"
{ (yyval.e) = new newArrayExp((yyvsp[-2].pos), (yyvsp[-1].t), 0, (yyvsp[0].dim), 0); }
-#line 2669 "camp.tab.c"
+#line 2783 "camp.tab.c"
break;
- case 142: /* exp: NEW celltype dims arrayinit */
-#line 505 "camp.y"
+ case 155: /* exp: NEW celltype dims arrayinit */
+#line 559 "camp.y"
{ (yyval.e) = new newArrayExp((yyvsp[-3].pos), (yyvsp[-2].t), 0, (yyvsp[-1].dim), (yyvsp[0].ai)); }
-#line 2675 "camp.tab.c"
+#line 2789 "camp.tab.c"
break;
- case 143: /* exp: NEW celltype '(' ')' blockstm */
-#line 507 "camp.y"
+ case 156: /* exp: NEW celltype '(' ')' blockstm */
+#line 561 "camp.y"
{ (yyval.e) = new newFunctionExp((yyvsp[-4].pos), (yyvsp[-3].t), new formals((yyvsp[-2].pos)), (yyvsp[0].s)); }
-#line 2681 "camp.tab.c"
+#line 2795 "camp.tab.c"
break;
- case 144: /* exp: NEW celltype dims '(' ')' blockstm */
-#line 509 "camp.y"
+ case 157: /* exp: NEW celltype dims '(' ')' blockstm */
+#line 563 "camp.y"
{ (yyval.e) = new newFunctionExp((yyvsp[-5].pos),
new arrayTy((yyvsp[-4].t)->getPos(), (yyvsp[-4].t), (yyvsp[-3].dim)),
new formals((yyvsp[-2].pos)),
(yyvsp[0].s)); }
-#line 2690 "camp.tab.c"
+#line 2804 "camp.tab.c"
break;
- case 145: /* exp: NEW celltype '(' formals ')' blockstm */
-#line 514 "camp.y"
+ case 158: /* exp: NEW celltype '(' formals ')' blockstm */
+#line 568 "camp.y"
{ (yyval.e) = new newFunctionExp((yyvsp[-5].pos), (yyvsp[-4].t), (yyvsp[-2].fls), (yyvsp[0].s)); }
-#line 2696 "camp.tab.c"
+#line 2810 "camp.tab.c"
break;
- case 146: /* exp: NEW celltype dims '(' formals ')' blockstm */
-#line 516 "camp.y"
+ case 159: /* exp: NEW celltype dims '(' formals ')' blockstm */
+#line 570 "camp.y"
{ (yyval.e) = new newFunctionExp((yyvsp[-6].pos),
new arrayTy((yyvsp[-5].t)->getPos(), (yyvsp[-5].t), (yyvsp[-4].dim)),
(yyvsp[-2].fls),
(yyvsp[0].s)); }
-#line 2705 "camp.tab.c"
+#line 2819 "camp.tab.c"
break;
- case 147: /* exp: exp '?' exp ':' exp */
-#line 521 "camp.y"
+ case 160: /* exp: exp '?' exp ':' exp */
+#line 575 "camp.y"
{ (yyval.e) = new conditionalExp((yyvsp[-3].pos), (yyvsp[-4].e), (yyvsp[-2].e), (yyvsp[0].e)); }
-#line 2711 "camp.tab.c"
+#line 2825 "camp.tab.c"
break;
- case 148: /* exp: exp ASSIGN exp */
-#line 522 "camp.y"
+ case 161: /* exp: exp ASSIGN exp */
+#line 576 "camp.y"
{ (yyval.e) = new assignExp((yyvsp[-1].pos), (yyvsp[-2].e), (yyvsp[0].e)); }
-#line 2717 "camp.tab.c"
+#line 2831 "camp.tab.c"
break;
- case 149: /* exp: '(' tuple ')' */
-#line 523 "camp.y"
+ case 162: /* exp: '(' tuple ')' */
+#line 577 "camp.y"
{ (yyval.e) = new callExp((yyvsp[-2].pos), new nameExp((yyvsp[-2].pos), SYM_TUPLE), (yyvsp[-1].alist)); }
-#line 2723 "camp.tab.c"
+#line 2837 "camp.tab.c"
break;
- case 150: /* exp: exp join exp */
-#line 525 "camp.y"
+ case 163: /* exp: exp join exp */
+#line 579 "camp.y"
{ (yyvsp[-1].j)->pushFront((yyvsp[-2].e)); (yyvsp[-1].j)->pushBack((yyvsp[0].e)); (yyval.e) = (yyvsp[-1].j); }
-#line 2729 "camp.tab.c"
+#line 2843 "camp.tab.c"
break;
- case 151: /* exp: exp dir */
-#line 527 "camp.y"
+ case 164: /* exp: exp dir */
+#line 581 "camp.y"
{ (yyvsp[0].se)->setSide(camp::OUT);
joinExp *jexp =
new joinExp((yyvsp[0].se)->getPos(), SYM_DOTS);
(yyval.e)=jexp;
jexp->pushBack((yyvsp[-1].e)); jexp->pushBack((yyvsp[0].se)); }
-#line 2739 "camp.tab.c"
+#line 2853 "camp.tab.c"
break;
- case 152: /* exp: INCR exp */
-#line 533 "camp.y"
+ case 165: /* exp: INCR exp */
+#line 587 "camp.y"
{ (yyval.e) = new prefixExp((yyvsp[-1].ps).pos, (yyvsp[0].e), SYM_PLUS); }
-#line 2745 "camp.tab.c"
+#line 2859 "camp.tab.c"
break;
- case 153: /* exp: DASHES exp */
-#line 535 "camp.y"
+ case 166: /* exp: DASHES exp */
+#line 589 "camp.y"
{ (yyval.e) = new prefixExp((yyvsp[-1].ps).pos, (yyvsp[0].e), SYM_MINUS); }
-#line 2751 "camp.tab.c"
+#line 2865 "camp.tab.c"
break;
- case 154: /* exp: exp INCR */
-#line 538 "camp.y"
+ case 167: /* exp: exp INCR */
+#line 592 "camp.y"
{ (yyval.e) = new postfixExp((yyvsp[0].ps).pos, (yyvsp[-1].e), SYM_PLUS); }
-#line 2757 "camp.tab.c"
+#line 2871 "camp.tab.c"
break;
- case 155: /* exp: exp SELFOP exp */
-#line 539 "camp.y"
+ case 168: /* exp: exp SELFOP exp */
+#line 593 "camp.y"
{ (yyval.e) = new selfExp((yyvsp[-1].ps).pos, (yyvsp[-2].e), (yyvsp[-1].ps).sym, (yyvsp[0].e)); }
-#line 2763 "camp.tab.c"
+#line 2877 "camp.tab.c"
break;
- case 156: /* exp: QUOTE '{' fileblock '}' */
-#line 541 "camp.y"
+ case 169: /* exp: QUOTE '{' fileblock '}' */
+#line 595 "camp.y"
{ (yyval.e) = new quoteExp((yyvsp[-3].pos), (yyvsp[-1].b)); }
-#line 2769 "camp.tab.c"
+#line 2883 "camp.tab.c"
break;
- case 157: /* join: DASHES */
-#line 547 "camp.y"
+ case 170: /* join: DASHES */
+#line 601 "camp.y"
{ (yyval.j) = new joinExp((yyvsp[0].ps).pos,(yyvsp[0].ps).sym); }
-#line 2775 "camp.tab.c"
+#line 2889 "camp.tab.c"
break;
- case 158: /* join: basicjoin */
-#line 549 "camp.y"
+ case 171: /* join: basicjoin */
+#line 603 "camp.y"
{ (yyval.j) = (yyvsp[0].j); }
-#line 2781 "camp.tab.c"
+#line 2895 "camp.tab.c"
break;
- case 159: /* join: dir basicjoin */
-#line 551 "camp.y"
+ case 172: /* join: dir basicjoin */
+#line 605 "camp.y"
{ (yyvsp[-1].se)->setSide(camp::OUT);
(yyval.j) = (yyvsp[0].j); (yyval.j)->pushFront((yyvsp[-1].se)); }
-#line 2788 "camp.tab.c"
+#line 2902 "camp.tab.c"
break;
- case 160: /* join: basicjoin dir */
-#line 554 "camp.y"
+ case 173: /* join: basicjoin dir */
+#line 608 "camp.y"
{ (yyvsp[0].se)->setSide(camp::IN);
(yyval.j) = (yyvsp[-1].j); (yyval.j)->pushBack((yyvsp[0].se)); }
-#line 2795 "camp.tab.c"
+#line 2909 "camp.tab.c"
break;
- case 161: /* join: dir basicjoin dir */
-#line 557 "camp.y"
+ case 174: /* join: dir basicjoin dir */
+#line 611 "camp.y"
{ (yyvsp[-2].se)->setSide(camp::OUT); (yyvsp[0].se)->setSide(camp::IN);
(yyval.j) = (yyvsp[-1].j); (yyval.j)->pushFront((yyvsp[-2].se)); (yyval.j)->pushBack((yyvsp[0].se)); }
-#line 2802 "camp.tab.c"
+#line 2916 "camp.tab.c"
break;
- case 162: /* dir: '{' CURL exp '}' */
-#line 562 "camp.y"
+ case 175: /* dir: '{' CURL exp '}' */
+#line 616 "camp.y"
{ (yyval.se) = new specExp((yyvsp[-2].ps).pos, (yyvsp[-2].ps).sym, (yyvsp[-1].e)); }
-#line 2808 "camp.tab.c"
+#line 2922 "camp.tab.c"
break;
- case 163: /* dir: '{' exp '}' */
-#line 563 "camp.y"
+ case 176: /* dir: '{' exp '}' */
+#line 617 "camp.y"
{ (yyval.se) = new specExp((yyvsp[-2].pos), symbol::opTrans("spec"), (yyvsp[-1].e)); }
-#line 2814 "camp.tab.c"
+#line 2928 "camp.tab.c"
break;
- case 164: /* dir: '{' exp ',' exp '}' */
-#line 565 "camp.y"
+ case 177: /* dir: '{' exp ',' exp '}' */
+#line 619 "camp.y"
{ (yyval.se) = new specExp((yyvsp[-4].pos), symbol::opTrans("spec"),
new pairExp((yyvsp[-2].pos), (yyvsp[-3].e), (yyvsp[-1].e))); }
-#line 2821 "camp.tab.c"
+#line 2935 "camp.tab.c"
break;
- case 165: /* dir: '{' exp ',' exp ',' exp '}' */
-#line 568 "camp.y"
+ case 178: /* dir: '{' exp ',' exp ',' exp '}' */
+#line 622 "camp.y"
{ (yyval.se) = new specExp((yyvsp[-6].pos), symbol::opTrans("spec"),
new tripleExp((yyvsp[-4].pos), (yyvsp[-5].e), (yyvsp[-3].e), (yyvsp[-1].e))); }
-#line 2828 "camp.tab.c"
+#line 2942 "camp.tab.c"
break;
- case 166: /* basicjoin: DOTS */
-#line 573 "camp.y"
+ case 179: /* basicjoin: DOTS */
+#line 627 "camp.y"
{ (yyval.j) = new joinExp((yyvsp[0].ps).pos, (yyvsp[0].ps).sym); }
-#line 2834 "camp.tab.c"
+#line 2948 "camp.tab.c"
break;
- case 167: /* basicjoin: DOTS tension DOTS */
-#line 575 "camp.y"
+ case 180: /* basicjoin: DOTS tension DOTS */
+#line 629 "camp.y"
{ (yyval.j) = new joinExp((yyvsp[-2].ps).pos, (yyvsp[-2].ps).sym); (yyval.j)->pushBack((yyvsp[-1].e)); }
-#line 2840 "camp.tab.c"
+#line 2954 "camp.tab.c"
break;
- case 168: /* basicjoin: DOTS controls DOTS */
-#line 577 "camp.y"
+ case 181: /* basicjoin: DOTS controls DOTS */
+#line 631 "camp.y"
{ (yyval.j) = new joinExp((yyvsp[-2].ps).pos, (yyvsp[-2].ps).sym); (yyval.j)->pushBack((yyvsp[-1].e)); }
-#line 2846 "camp.tab.c"
+#line 2960 "camp.tab.c"
break;
- case 169: /* basicjoin: COLONS */
-#line 578 "camp.y"
+ case 182: /* basicjoin: COLONS */
+#line 632 "camp.y"
{ (yyval.j) = new joinExp((yyvsp[0].ps).pos, (yyvsp[0].ps).sym); }
-#line 2852 "camp.tab.c"
+#line 2966 "camp.tab.c"
break;
- case 170: /* basicjoin: LONGDASH */
-#line 579 "camp.y"
+ case 183: /* basicjoin: LONGDASH */
+#line 633 "camp.y"
{ (yyval.j) = new joinExp((yyvsp[0].ps).pos, (yyvsp[0].ps).sym); }
-#line 2858 "camp.tab.c"
+#line 2972 "camp.tab.c"
break;
- case 171: /* tension: TENSION exp */
-#line 583 "camp.y"
+ case 184: /* tension: TENSION exp */
+#line 637 "camp.y"
{ (yyval.e) = new binaryExp((yyvsp[-1].ps).pos, (yyvsp[0].e), (yyvsp[-1].ps).sym,
new booleanExp((yyvsp[-1].ps).pos, false)); }
-#line 2865 "camp.tab.c"
+#line 2979 "camp.tab.c"
break;
- case 172: /* tension: TENSION exp AND exp */
-#line 586 "camp.y"
+ case 185: /* tension: TENSION exp AND exp */
+#line 640 "camp.y"
{ (yyval.e) = new ternaryExp((yyvsp[-3].ps).pos, (yyvsp[-2].e), (yyvsp[-3].ps).sym, (yyvsp[0].e),
new booleanExp((yyvsp[-3].ps).pos, false)); }
-#line 2872 "camp.tab.c"
+#line 2986 "camp.tab.c"
break;
- case 173: /* tension: TENSION ATLEAST exp */
-#line 589 "camp.y"
+ case 186: /* tension: TENSION ATLEAST exp */
+#line 643 "camp.y"
{ (yyval.e) = new binaryExp((yyvsp[-2].ps).pos, (yyvsp[0].e), (yyvsp[-2].ps).sym,
new booleanExp((yyvsp[-1].ps).pos, true)); }
-#line 2879 "camp.tab.c"
+#line 2993 "camp.tab.c"
break;
- case 174: /* tension: TENSION ATLEAST exp AND exp */
-#line 592 "camp.y"
+ case 187: /* tension: TENSION ATLEAST exp AND exp */
+#line 646 "camp.y"
{ (yyval.e) = new ternaryExp((yyvsp[-4].ps).pos, (yyvsp[-2].e), (yyvsp[-4].ps).sym, (yyvsp[0].e),
new booleanExp((yyvsp[-3].ps).pos, true)); }
-#line 2886 "camp.tab.c"
+#line 3000 "camp.tab.c"
break;
- case 175: /* controls: CONTROLS exp */
-#line 597 "camp.y"
+ case 188: /* controls: CONTROLS exp */
+#line 651 "camp.y"
{ (yyval.e) = new unaryExp((yyvsp[-1].ps).pos, (yyvsp[0].e), (yyvsp[-1].ps).sym); }
-#line 2892 "camp.tab.c"
+#line 3006 "camp.tab.c"
break;
- case 176: /* controls: CONTROLS exp AND exp */
-#line 599 "camp.y"
+ case 189: /* controls: CONTROLS exp AND exp */
+#line 653 "camp.y"
{ (yyval.e) = new binaryExp((yyvsp[-3].ps).pos, (yyvsp[-2].e), (yyvsp[-3].ps).sym, (yyvsp[0].e)); }
-#line 2898 "camp.tab.c"
+#line 3012 "camp.tab.c"
break;
- case 177: /* stm: ';' */
-#line 603 "camp.y"
+ case 190: /* stm: ';' */
+#line 657 "camp.y"
{ (yyval.s) = new emptyStm((yyvsp[0].pos)); }
-#line 2904 "camp.tab.c"
+#line 3018 "camp.tab.c"
break;
- case 178: /* stm: blockstm */
-#line 604 "camp.y"
+ case 191: /* stm: blockstm */
+#line 658 "camp.y"
{ (yyval.s) = (yyvsp[0].s); }
-#line 2910 "camp.tab.c"
+#line 3024 "camp.tab.c"
break;
- case 179: /* stm: stmexp ';' */
-#line 605 "camp.y"
+ case 192: /* stm: stmexp ';' */
+#line 659 "camp.y"
{ (yyval.s) = (yyvsp[-1].s); }
-#line 2916 "camp.tab.c"
+#line 3030 "camp.tab.c"
break;
- case 180: /* stm: IF '(' exp ')' stm */
-#line 607 "camp.y"
+ case 193: /* stm: IF '(' exp ')' stm */
+#line 661 "camp.y"
{ (yyval.s) = new ifStm((yyvsp[-4].pos), (yyvsp[-2].e), (yyvsp[0].s)); }
-#line 2922 "camp.tab.c"
+#line 3036 "camp.tab.c"
break;
- case 181: /* stm: IF '(' exp ')' stm ELSE stm */
-#line 609 "camp.y"
+ case 194: /* stm: IF '(' exp ')' stm ELSE stm */
+#line 663 "camp.y"
{ (yyval.s) = new ifStm((yyvsp[-6].pos), (yyvsp[-4].e), (yyvsp[-2].s), (yyvsp[0].s)); }
-#line 2928 "camp.tab.c"
+#line 3042 "camp.tab.c"
break;
- case 182: /* stm: WHILE '(' exp ')' stm */
-#line 611 "camp.y"
+ case 195: /* stm: WHILE '(' exp ')' stm */
+#line 665 "camp.y"
{ (yyval.s) = new whileStm((yyvsp[-4].pos), (yyvsp[-2].e), (yyvsp[0].s)); }
-#line 2934 "camp.tab.c"
+#line 3048 "camp.tab.c"
break;
- case 183: /* stm: DO stm WHILE '(' exp ')' ';' */
-#line 613 "camp.y"
+ case 196: /* stm: DO stm WHILE '(' exp ')' ';' */
+#line 667 "camp.y"
{ (yyval.s) = new doStm((yyvsp[-6].pos), (yyvsp[-5].s), (yyvsp[-2].e)); }
-#line 2940 "camp.tab.c"
+#line 3054 "camp.tab.c"
break;
- case 184: /* stm: FOR '(' forinit ';' fortest ';' forupdate ')' stm */
-#line 615 "camp.y"
+ case 197: /* stm: FOR '(' forinit ';' fortest ';' forupdate ')' stm */
+#line 669 "camp.y"
{ (yyval.s) = new forStm((yyvsp[-8].pos), (yyvsp[-6].run), (yyvsp[-4].e), (yyvsp[-2].sel), (yyvsp[0].s)); }
-#line 2946 "camp.tab.c"
+#line 3060 "camp.tab.c"
break;
- case 185: /* stm: FOR '(' type ID ':' exp ')' stm */
-#line 617 "camp.y"
+ case 198: /* stm: FOR '(' type ID ':' exp ')' stm */
+#line 671 "camp.y"
{ (yyval.s) = new extendedForStm((yyvsp[-7].pos), (yyvsp[-5].t), (yyvsp[-4].ps).sym, (yyvsp[-2].e), (yyvsp[0].s)); }
-#line 2952 "camp.tab.c"
+#line 3066 "camp.tab.c"
break;
- case 186: /* stm: BREAK ';' */
-#line 618 "camp.y"
+ case 199: /* stm: BREAK ';' */
+#line 672 "camp.y"
{ (yyval.s) = new breakStm((yyvsp[-1].pos)); }
-#line 2958 "camp.tab.c"
+#line 3072 "camp.tab.c"
break;
- case 187: /* stm: CONTINUE ';' */
-#line 619 "camp.y"
+ case 200: /* stm: CONTINUE ';' */
+#line 673 "camp.y"
{ (yyval.s) = new continueStm((yyvsp[-1].pos)); }
-#line 2964 "camp.tab.c"
+#line 3078 "camp.tab.c"
break;
- case 188: /* stm: RETURN_ ';' */
-#line 620 "camp.y"
+ case 201: /* stm: RETURN_ ';' */
+#line 674 "camp.y"
{ (yyval.s) = new returnStm((yyvsp[-1].pos)); }
-#line 2970 "camp.tab.c"
+#line 3084 "camp.tab.c"
break;
- case 189: /* stm: RETURN_ exp ';' */
-#line 621 "camp.y"
+ case 202: /* stm: RETURN_ exp ';' */
+#line 675 "camp.y"
{ (yyval.s) = new returnStm((yyvsp[-2].pos), (yyvsp[-1].e)); }
-#line 2976 "camp.tab.c"
+#line 3090 "camp.tab.c"
break;
- case 190: /* stmexp: exp */
-#line 625 "camp.y"
+ case 203: /* stmexp: exp */
+#line 679 "camp.y"
{ (yyval.s) = new expStm((yyvsp[0].e)->getPos(), (yyvsp[0].e)); }
-#line 2982 "camp.tab.c"
+#line 3096 "camp.tab.c"
break;
- case 191: /* blockstm: block */
-#line 629 "camp.y"
+ case 204: /* blockstm: block */
+#line 683 "camp.y"
{ (yyval.s) = new blockStm((yyvsp[0].b)->getPos(), (yyvsp[0].b)); }
-#line 2988 "camp.tab.c"
+#line 3102 "camp.tab.c"
break;
- case 192: /* forinit: %empty */
-#line 633 "camp.y"
+ case 205: /* forinit: %empty */
+#line 687 "camp.y"
{ (yyval.run) = 0; }
-#line 2994 "camp.tab.c"
+#line 3108 "camp.tab.c"
break;
- case 193: /* forinit: stmexplist */
-#line 634 "camp.y"
+ case 206: /* forinit: stmexplist */
+#line 688 "camp.y"
{ (yyval.run) = (yyvsp[0].sel); }
-#line 3000 "camp.tab.c"
+#line 3114 "camp.tab.c"
break;
- case 194: /* forinit: barevardec */
-#line 635 "camp.y"
+ case 207: /* forinit: barevardec */
+#line 689 "camp.y"
{ (yyval.run) = (yyvsp[0].vd); }
-#line 3006 "camp.tab.c"
+#line 3120 "camp.tab.c"
break;
- case 195: /* fortest: %empty */
-#line 639 "camp.y"
+ case 208: /* fortest: %empty */
+#line 693 "camp.y"
{ (yyval.e) = 0; }
-#line 3012 "camp.tab.c"
+#line 3126 "camp.tab.c"
break;
- case 196: /* fortest: exp */
-#line 640 "camp.y"
+ case 209: /* fortest: exp */
+#line 694 "camp.y"
{ (yyval.e) = (yyvsp[0].e); }
-#line 3018 "camp.tab.c"
+#line 3132 "camp.tab.c"
break;
- case 197: /* forupdate: %empty */
-#line 644 "camp.y"
+ case 210: /* forupdate: %empty */
+#line 698 "camp.y"
{ (yyval.sel) = 0; }
-#line 3024 "camp.tab.c"
+#line 3138 "camp.tab.c"
break;
- case 198: /* forupdate: stmexplist */
-#line 645 "camp.y"
+ case 211: /* forupdate: stmexplist */
+#line 699 "camp.y"
{ (yyval.sel) = (yyvsp[0].sel); }
-#line 3030 "camp.tab.c"
+#line 3144 "camp.tab.c"
break;
- case 199: /* stmexplist: stmexp */
-#line 649 "camp.y"
+ case 212: /* stmexplist: stmexp */
+#line 703 "camp.y"
{ (yyval.sel) = new stmExpList((yyvsp[0].s)->getPos()); (yyval.sel)->add((yyvsp[0].s)); }
-#line 3036 "camp.tab.c"
+#line 3150 "camp.tab.c"
break;
- case 200: /* stmexplist: stmexplist ',' stmexp */
-#line 651 "camp.y"
+ case 213: /* stmexplist: stmexplist ',' stmexp */
+#line 705 "camp.y"
{ (yyval.sel) = (yyvsp[-2].sel); (yyval.sel)->add((yyvsp[0].s)); }
-#line 3042 "camp.tab.c"
+#line 3156 "camp.tab.c"
break;
-#line 3046 "camp.tab.c"
+#line 3160 "camp.tab.c"
default: break;
}
diff --git a/Build/source/utils/asymptote/camp.tab.h b/Build/source/utils/asymptote/camp.tab.h
index 48d41824e8b..a0d9cee40df 100644
--- a/Build/source/utils/asymptote/camp.tab.h
+++ b/Build/source/utils/asymptote/camp.tab.h
@@ -163,8 +163,10 @@ union YYSTYPE
//absyntax::funheader *fh;
absyntax::formal *fl;
absyntax::formals *fls;
+ absyntax::typeParam *tp;
+ absyntax::typeParamList *tps;
-#line 168 "camp.tab.h"
+#line 170 "camp.tab.h"
};
typedef union YYSTYPE YYSTYPE;
diff --git a/Build/source/utils/asymptote/camp.y b/Build/source/utils/asymptote/camp.y
index 01bd47ecbcc..0f2cc5435e4 100644
--- a/Build/source/utils/asymptote/camp.y
+++ b/Build/source/utils/asymptote/camp.y
@@ -102,7 +102,9 @@ using mem::string;
//absyntax::funheader *fh;
absyntax::formal *fl;
absyntax::formals *fls;
-}
+ absyntax::typeParam *tp;
+ absyntax::typeParamList *tps;
+}
%token <ps> ID SELFOP
DOTS COLONS DASHES INCR LONGDASH
@@ -136,7 +138,7 @@ using mem::string;
%left DIRTAG CONTROLS TENSION ATLEAST AND
%left CURL '{' '}'
-%left '+' '-'
+%left '+' '-'
%left '*' '/' '%' '#' LIT
%left UNARY
%right '^'
@@ -151,7 +153,7 @@ using mem::string;
%type <ps> strid
%type <ip> idpair stridpair
%type <ipl> idpairlist stridpairlist
-%type <vd> vardec barevardec
+%type <vd> vardec barevardec
%type <t> type celltype
%type <dim> dims
%type <dil> decidlist
@@ -159,8 +161,8 @@ using mem::string;
%type <dis> decidstart
%type <vi> varinit
%type <ai> arrayinit basearrayinit varinits
-%type <fl> formal
-%type <fls> formals
+%type <fl> formal decdec
+%type <fls> formals decdeclist
%type <e> value exp fortest
%type <arg> argument
%type <slice> slice
@@ -173,6 +175,8 @@ using mem::string;
%type <run> forinit
%type <sel> forupdate stmexplist
%type <boo> explicitornot
+%type <tp> typeparam
+%type <tps> typeparamlist
/* There are four shift/reduce conflicts:
* the dangling ELSE in IF (exp) IF (exp) stm ELSE stm
@@ -245,9 +249,59 @@ dec:
{ $$ = new fromaccessdec($1, $2.sym, WILDCARD); }
| IMPORT stridpair ';'
{ $$ = new importdec($1, $2); }
-| INCLUDE ID ';' { $$ = new includedec($1, $2.sym); }
+| INCLUDE ID ';' { $$ = new includedec($1, $2.sym); }
| INCLUDE STRING ';'
{ $$ = new includedec($1, $2->getString()); }
+
+// Experimental - templated imports.
+| TYPEDEF IMPORT '(' typeparamlist ')' ';'
+ { $$ = new receiveTypedefDec($1, $4); }
+| IMPORT TYPEDEF '(' typeparamlist ')' ';'
+ { $$ = new badDec($1, $1,
+ "Expected 'typedef import(<types>);'");
+ }
+/* ACCESS strid '(' decdeclist ')' 'as' ID */
+| ACCESS strid '(' decdeclist ')' ID ID ';'
+ { $$ = new templateAccessDec(
+ $1, $2.sym, $4, $6.sym, $7.sym, $6.pos
+ ); }
+| ACCESS strid '(' decdeclist ')' ';'
+ { $$ = new badDec($1, $6, "expected 'as'"); }
+| IMPORT strid '(' decdeclist ')' ';'
+ { $$ = new badDec($1, $1,
+ "Parametrized imports disallowed to reduce naming "
+ "conflicts. Try "
+ "'access <module>(<type parameters>) as <newname>;'."
+ ); }
+| FROM strid '(' decdeclist ')' ACCESS idpairlist ';'
+ { $$ = new fromaccessdec($1, $2.sym, $7, $4); }
+;
+
+// List mapping dec to dec as in "Key=string, Value=int"
+decdec:
+ ID ASSIGN type
+ { $$ = new formal(
+ $1.pos, $3, new decidstart($1.pos, $1.sym)
+ ); }
+| type { $$ = new formal($1->getPos(), $1, nullptr); } // ultimately log error
+;
+
+decdeclist:
+ decdec
+ { $$ = new formals($1->getPos()); $$->add($1); }
+| decdeclist ',' decdec
+ { $$ = $1; $$->add($3); }
+;
+
+typeparam:
+ ID { $$ = new typeParam($1.pos, $1.sym); }
+;
+
+typeparamlist:
+ typeparam
+ { $$ = new typeParamList($1->getPos()); $$->add($1); }
+| typeparamlist ',' typeparam
+ { $$ = $1; $$->add($3); }
;
idpair:
@@ -412,7 +466,7 @@ slice:
;
value:
- value '.' ID { $$ = new fieldExp($2, $1, $3.sym); }
+ value '.' ID { $$ = new fieldExp($2, $1, $3.sym); }
| name '[' exp ']' { $$ = new subscriptExp($2,
new nameExp($1->getPos(), $1), $3); }
| value '[' exp ']'{ $$ = new subscriptExp($2, $1, $3); }
@@ -421,9 +475,9 @@ value:
| value '[' slice ']'{ $$ = new sliceExp($2, $1, $3); }
| name '(' ')' { $$ = new callExp($2,
new nameExp($1->getPos(), $1),
- new arglist()); }
+ new arglist()); }
| name '(' arglist ')'
- { $$ = new callExp($2,
+ { $$ = new callExp($2,
new nameExp($1->getPos(), $1),
$3); }
| value '(' ')' { $$ = new callExp($2, $1, new arglist()); }
@@ -521,7 +575,7 @@ exp:
{ $$ = new conditionalExp($2, $1, $3, $5); }
| exp ASSIGN exp { $$ = new assignExp($2, $1, $3); }
| '(' tuple ')' { $$ = new callExp($1, new nameExp($1, SYM_TUPLE), $2); }
-| exp join exp %prec JOIN_PREC
+| exp join exp %prec JOIN_PREC
{ $2->pushFront($1); $2->pushBack($3); $$ = $2; }
| exp dir %prec DIRTAG
{ $2->setSide(camp::OUT);
@@ -534,7 +588,7 @@ exp:
| DASHES exp %prec UNARY
{ $$ = new prefixExp($1.pos, $2, SYM_MINUS); }
/* Illegal - will be caught during translation. */
-| exp INCR %prec UNARY
+| exp INCR %prec UNARY
{ $$ = new postfixExp($2.pos, $1, SYM_PLUS); }
| exp SELFOP exp { $$ = new selfExp($2.pos, $1, $2.sym, $3); }
| QUOTE '{' fileblock '}'
@@ -545,12 +599,12 @@ exp:
// made a whack of reduce/reduce errors.
join:
DASHES { $$ = new joinExp($1.pos,$1.sym); }
-| basicjoin %prec JOIN_PREC
+| basicjoin %prec JOIN_PREC
{ $$ = $1; }
| dir basicjoin %prec JOIN_PREC
{ $1->setSide(camp::OUT);
$$ = $2; $$->pushFront($1); }
-| basicjoin dir %prec JOIN_PREC
+| basicjoin dir %prec JOIN_PREC
{ $2->setSide(camp::IN);
$$ = $1; $$->pushBack($2); }
| dir basicjoin dir %prec JOIN_PREC
@@ -585,7 +639,7 @@ tension:
| TENSION exp AND exp
{ $$ = new ternaryExp($1.pos, $2, $1.sym, $4,
new booleanExp($1.pos, false)); }
-| TENSION ATLEAST exp
+| TENSION ATLEAST exp
{ $$ = new binaryExp($1.pos, $3, $1.sym,
new booleanExp($2.pos, true)); }
| TENSION ATLEAST exp AND exp
diff --git a/Build/source/utils/asymptote/common.h b/Build/source/utils/asymptote/common.h
index 50f397c7e35..6ee3d971f08 100644
--- a/Build/source/utils/asymptote/common.h
+++ b/Build/source/utils/asymptote/common.h
@@ -17,16 +17,27 @@
#include "config.h"
#endif
+#if __cplusplus < 201703L
+
#ifdef HAVE_LSP
#include <boost/optional.hpp>
#include <boost/none.hpp>
using boost::optional;
+#define nullopt boost::none
using boost::make_optional;
#else
#include "optional.hpp"
#define boost nonstd
using nonstd::optional;
using nonstd::nullopt;
+using nonstd::make_optional;
+#endif
+
+#else
+#include <optional>
+using std::optional;
+using std::nullopt;
+using std::make_optional;
#endif
using std::make_pair;
diff --git a/Build/source/utils/asymptote/config.guess b/Build/source/utils/asymptote/config.guess
index f6d217a49f8..c7f17e8fb97 100755
--- a/Build/source/utils/asymptote/config.guess
+++ b/Build/source/utils/asymptote/config.guess
@@ -1,10 +1,10 @@
-#! /bin/sh
+#!/usr/bin/sh
# Attempt to guess a canonical system name.
-# Copyright 1992-2024 Free Software Foundation, Inc.
+# Copyright 1992-2022 Free Software Foundation, Inc.
# shellcheck disable=SC2006,SC2268 # see below for rationale
-timestamp='2024-01-01'
+timestamp='2022-05-25'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -47,7 +47,7 @@ me=`echo "$0" | sed -e 's,.*/,,'`
usage="\
Usage: $0 [OPTION]
-Output the configuration name of the system '$me' is run on.
+Output the configuration name of the system \`$me' is run on.
Options:
-h, --help print this help, then exit
@@ -60,13 +60,13 @@ version="\
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright 1992-2024 Free Software Foundation, Inc.
+Copyright 1992-2022 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
help="
-Try '$me --help' for more information."
+Try \`$me --help' for more information."
# Parse command line
while test $# -gt 0 ; do
@@ -102,8 +102,8 @@ GUESS=
# temporary files to be created and, as you can see below, it is a
# headache to deal with in a portable fashion.
-# Historically, 'CC_FOR_BUILD' used to be named 'HOST_CC'. We still
-# use 'HOST_CC' if defined, but it is deprecated.
+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
+# use `HOST_CC' if defined, but it is deprecated.
# Portable tmp directory creation inspired by the Autoconf team.
@@ -155,9 +155,6 @@ Linux|GNU|GNU/*)
set_cc_for_build
cat <<-EOF > "$dummy.c"
- #if defined(__ANDROID__)
- LIBC=android
- #else
#include <features.h>
#if defined(__UCLIBC__)
LIBC=uclibc
@@ -165,8 +162,6 @@ Linux|GNU|GNU/*)
LIBC=dietlibc
#elif defined(__GLIBC__)
LIBC=gnu
- #elif defined(__LLVM_LIBC__)
- LIBC=llvm
#else
#include <stdarg.h>
/* First heuristic to detect musl libc. */
@@ -174,7 +169,6 @@ Linux|GNU|GNU/*)
LIBC=musl
#endif
#endif
- #endif
EOF
cc_set_libc=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
eval "$cc_set_libc"
@@ -465,7 +459,7 @@ case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in
UNAME_RELEASE=`uname -v`
;;
esac
- # Japanese Language versions have a version number like '4.1.3-JL'.
+ # Japanese Language versions have a version number like `4.1.3-JL'.
SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/'`
GUESS=sparc-sun-sunos$SUN_REL
;;
@@ -910,7 +904,7 @@ EOF
fi
;;
*:FreeBSD:*:*)
- UNAME_PROCESSOR=`uname -p`
+ UNAME_PROCESSOR=`/usr/bin/uname -p`
case $UNAME_PROCESSOR in
amd64)
UNAME_PROCESSOR=x86_64 ;;
@@ -972,37 +966,11 @@ EOF
GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'`
GUESS=$UNAME_MACHINE-unknown-$GNU_SYS$GNU_REL-$LIBC
;;
- x86_64:[Mm]anagarm:*:*|i?86:[Mm]anagarm:*:*)
- GUESS="$UNAME_MACHINE-pc-managarm-mlibc"
- ;;
- *:[Mm]anagarm:*:*)
- GUESS="$UNAME_MACHINE-unknown-managarm-mlibc"
- ;;
*:Minix:*:*)
GUESS=$UNAME_MACHINE-unknown-minix
;;
aarch64:Linux:*:*)
- set_cc_for_build
- CPU=$UNAME_MACHINE
- LIBCABI=$LIBC
- if test "$CC_FOR_BUILD" != no_compiler_found; then
- ABI=64
- sed 's/^ //' << EOF > "$dummy.c"
- #ifdef __ARM_EABI__
- #ifdef __ARM_PCS_VFP
- ABI=eabihf
- #else
- ABI=eabi
- #endif
- #endif
-EOF
- cc_set_abi=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^ABI' | sed 's, ,,g'`
- eval "$cc_set_abi"
- case $ABI in
- eabi | eabihf) CPU=armv8l; LIBCABI=$LIBC$ABI ;;
- esac
- fi
- GUESS=$CPU-unknown-linux-$LIBCABI
+ GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
;;
aarch64_be:Linux:*:*)
UNAME_MACHINE=aarch64_be
@@ -1068,16 +1036,7 @@ EOF
k1om:Linux:*:*)
GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
;;
- kvx:Linux:*:*)
- GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
- ;;
- kvx:cos:*:*)
- GUESS=$UNAME_MACHINE-unknown-cos
- ;;
- kvx:mbr:*:*)
- GUESS=$UNAME_MACHINE-unknown-mbr
- ;;
- loongarch32:Linux:*:* | loongarch64:Linux:*:*)
+ loongarch32:Linux:*:* | loongarch64:Linux:*:* | loongarchx32:Linux:*:*)
GUESS=$UNAME_MACHINE-unknown-linux-$LIBC
;;
m32r*:Linux:*:*)
@@ -1232,7 +1191,7 @@ EOF
GUESS=$UNAME_MACHINE-pc-sysv4.2uw$UNAME_VERSION
;;
i*86:OS/2:*:*)
- # If we were able to find 'uname', then EMX Unix compatibility
+ # If we were able to find `uname', then EMX Unix compatibility
# is probably installed.
GUESS=$UNAME_MACHINE-pc-os2-emx
;;
@@ -1373,7 +1332,7 @@ EOF
GUESS=ns32k-sni-sysv
fi
;;
- PENTIUM:*:4.0*:*) # Unisys 'ClearPath HMP IX 4000' SVR4/MP effort
+ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
# says <Richard.M.Bartel@ccMail.Census.GOV>
GUESS=i586-unisys-sysv4
;;
@@ -1595,9 +1554,6 @@ EOF
*:Unleashed:*:*)
GUESS=$UNAME_MACHINE-unknown-unleashed$UNAME_RELEASE
;;
- *:Ironclad:*:*)
- GUESS=$UNAME_MACHINE-unknown-ironclad
- ;;
esac
# Do we have a guess based on uname results?
diff --git a/Build/source/utils/asymptote/config.sub b/Build/source/utils/asymptote/config.sub
index 2c6a07ab3c3..f02d43ad500 100755
--- a/Build/source/utils/asymptote/config.sub
+++ b/Build/source/utils/asymptote/config.sub
@@ -1,14 +1,12 @@
#! /bin/sh
# Configuration validation subroutine script.
-# Copyright 1992-2024 Free Software Foundation, Inc.
+# Copyright 1992-2020 Free Software Foundation, Inc.
-# shellcheck disable=SC2006,SC2268 # see below for rationale
-
-timestamp='2024-01-01'
+timestamp='2020-01-01'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful, but
@@ -35,7 +33,7 @@ timestamp='2024-01-01'
# Otherwise, we print the canonical config type on stdout and succeed.
# You can get the latest version of this script from:
-# https://git.savannah.gnu.org/cgit/config.git/plain/config.sub
+# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
# This file is supposed to be the same for all GNU packages
# and recognize all the CPU types, system types and aliases
@@ -52,13 +50,6 @@ timestamp='2024-01-01'
# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
# It is wrong to echo any other type of specification.
-# The "shellcheck disable" line above the timestamp inhibits complaints
-# about features and limitations of the classic Bourne shell that were
-# superseded or lifted in POSIX. However, this script identifies a wide
-# variety of pre-POSIX systems that do not have POSIX shells at all, and
-# even some reasonably current systems (Solaris 10 as case-in-point) still
-# have a pre-POSIX /bin/sh.
-
me=`echo "$0" | sed -e 's,.*/,,'`
usage="\
@@ -76,13 +67,13 @@ Report bugs and patches to <config-patches@gnu.org>."
version="\
GNU config.sub ($timestamp)
-Copyright 1992-2024 Free Software Foundation, Inc.
+Copyright 1992-2020 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
help="
-Try '$me --help' for more information."
+Try \`$me --help' for more information."
# Parse command line
while test $# -gt 0 ; do
@@ -121,42 +112,40 @@ esac
# Split fields of configuration type
# shellcheck disable=SC2162
-saved_IFS=$IFS
IFS="-" read field1 field2 field3 field4 <<EOF
$1
EOF
-IFS=$saved_IFS
# Separate into logical components for further validation
case $1 in
*-*-*-*-*)
- echo "Invalid configuration '$1': more than four components" >&2
+ echo Invalid configuration \`"$1"\': more than four components >&2
exit 1
;;
*-*-*-*)
basic_machine=$field1-$field2
- basic_os=$field3-$field4
+ os=$field3-$field4
;;
*-*-*)
# Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two
# parts
maybe_os=$field2-$field3
case $maybe_os in
- nto-qnx* | linux-* | uclinux-uclibc* \
+ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc \
+ | linux-newlib* | linux-musl* | linux-uclibc* | uclinux-uclibc* \
| uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \
| netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \
- | storm-chaos* | os2-emx* | rtmk-nova* | managarm-* \
- | windows-* )
+ | storm-chaos* | os2-emx* | rtmk-nova*)
basic_machine=$field1
- basic_os=$maybe_os
+ os=$maybe_os
;;
android-linux)
basic_machine=$field1-unknown
- basic_os=linux-android
+ os=linux-android
;;
*)
basic_machine=$field1-$field2
- basic_os=$field3
+ os=$field3
;;
esac
;;
@@ -165,7 +154,7 @@ case $1 in
case $field1-$field2 in
decstation-3100)
basic_machine=mips-dec
- basic_os=
+ os=
;;
*-*)
# Second component is usually, but not always the OS
@@ -173,11 +162,7 @@ case $1 in
# Prevent following clause from handling this valid os
sun*os*)
basic_machine=$field1
- basic_os=$field2
- ;;
- zephyr*)
- basic_machine=$field1-unknown
- basic_os=$field2
+ os=$field2
;;
# Manufacturers
dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \
@@ -190,11 +175,11 @@ case $1 in
| microblaze* | sim | cisco \
| oki | wec | wrs | winbond)
basic_machine=$field1-$field2
- basic_os=
+ os=
;;
*)
basic_machine=$field1
- basic_os=$field2
+ os=$field2
;;
esac
;;
@@ -206,451 +191,447 @@ case $1 in
case $field1 in
386bsd)
basic_machine=i386-pc
- basic_os=bsd
+ os=bsd
;;
a29khif)
basic_machine=a29k-amd
- basic_os=udi
+ os=udi
;;
adobe68k)
basic_machine=m68010-adobe
- basic_os=scout
+ os=scout
;;
alliant)
basic_machine=fx80-alliant
- basic_os=
+ os=
;;
altos | altos3068)
basic_machine=m68k-altos
- basic_os=
+ os=
;;
am29k)
basic_machine=a29k-none
- basic_os=bsd
+ os=bsd
;;
amdahl)
basic_machine=580-amdahl
- basic_os=sysv
+ os=sysv
;;
amiga)
basic_machine=m68k-unknown
- basic_os=
+ os=
;;
amigaos | amigados)
basic_machine=m68k-unknown
- basic_os=amigaos
+ os=amigaos
;;
amigaunix | amix)
basic_machine=m68k-unknown
- basic_os=sysv4
+ os=sysv4
;;
apollo68)
basic_machine=m68k-apollo
- basic_os=sysv
+ os=sysv
;;
apollo68bsd)
basic_machine=m68k-apollo
- basic_os=bsd
+ os=bsd
;;
aros)
basic_machine=i386-pc
- basic_os=aros
+ os=aros
;;
aux)
basic_machine=m68k-apple
- basic_os=aux
+ os=aux
;;
balance)
basic_machine=ns32k-sequent
- basic_os=dynix
+ os=dynix
;;
blackfin)
basic_machine=bfin-unknown
- basic_os=linux
+ os=linux
;;
cegcc)
basic_machine=arm-unknown
- basic_os=cegcc
+ os=cegcc
;;
convex-c1)
basic_machine=c1-convex
- basic_os=bsd
+ os=bsd
;;
convex-c2)
basic_machine=c2-convex
- basic_os=bsd
+ os=bsd
;;
convex-c32)
basic_machine=c32-convex
- basic_os=bsd
+ os=bsd
;;
convex-c34)
basic_machine=c34-convex
- basic_os=bsd
+ os=bsd
;;
convex-c38)
basic_machine=c38-convex
- basic_os=bsd
+ os=bsd
;;
cray)
basic_machine=j90-cray
- basic_os=unicos
+ os=unicos
;;
crds | unos)
basic_machine=m68k-crds
- basic_os=
+ os=
;;
da30)
basic_machine=m68k-da30
- basic_os=
+ os=
;;
decstation | pmax | pmin | dec3100 | decstatn)
basic_machine=mips-dec
- basic_os=
+ os=
;;
delta88)
basic_machine=m88k-motorola
- basic_os=sysv3
+ os=sysv3
;;
dicos)
basic_machine=i686-pc
- basic_os=dicos
+ os=dicos
;;
djgpp)
basic_machine=i586-pc
- basic_os=msdosdjgpp
+ os=msdosdjgpp
;;
ebmon29k)
basic_machine=a29k-amd
- basic_os=ebmon
+ os=ebmon
;;
es1800 | OSE68k | ose68k | ose | OSE)
basic_machine=m68k-ericsson
- basic_os=ose
+ os=ose
;;
gmicro)
basic_machine=tron-gmicro
- basic_os=sysv
+ os=sysv
;;
go32)
basic_machine=i386-pc
- basic_os=go32
+ os=go32
;;
h8300hms)
basic_machine=h8300-hitachi
- basic_os=hms
+ os=hms
;;
h8300xray)
basic_machine=h8300-hitachi
- basic_os=xray
+ os=xray
;;
h8500hms)
basic_machine=h8500-hitachi
- basic_os=hms
+ os=hms
;;
harris)
basic_machine=m88k-harris
- basic_os=sysv3
+ os=sysv3
;;
hp300 | hp300hpux)
basic_machine=m68k-hp
- basic_os=hpux
+ os=hpux
;;
hp300bsd)
basic_machine=m68k-hp
- basic_os=bsd
+ os=bsd
;;
hppaosf)
basic_machine=hppa1.1-hp
- basic_os=osf
+ os=osf
;;
hppro)
basic_machine=hppa1.1-hp
- basic_os=proelf
+ os=proelf
;;
i386mach)
basic_machine=i386-mach
- basic_os=mach
+ os=mach
;;
isi68 | isi)
basic_machine=m68k-isi
- basic_os=sysv
+ os=sysv
;;
m68knommu)
basic_machine=m68k-unknown
- basic_os=linux
+ os=linux
;;
magnum | m3230)
basic_machine=mips-mips
- basic_os=sysv
+ os=sysv
;;
merlin)
basic_machine=ns32k-utek
- basic_os=sysv
+ os=sysv
;;
mingw64)
basic_machine=x86_64-pc
- basic_os=mingw64
+ os=mingw64
;;
mingw32)
basic_machine=i686-pc
- basic_os=mingw32
+ os=mingw32
;;
mingw32ce)
basic_machine=arm-unknown
- basic_os=mingw32ce
+ os=mingw32ce
;;
monitor)
basic_machine=m68k-rom68k
- basic_os=coff
+ os=coff
;;
morphos)
basic_machine=powerpc-unknown
- basic_os=morphos
+ os=morphos
;;
moxiebox)
basic_machine=moxie-unknown
- basic_os=moxiebox
+ os=moxiebox
;;
msdos)
basic_machine=i386-pc
- basic_os=msdos
+ os=msdos
;;
msys)
basic_machine=i686-pc
- basic_os=msys
+ os=msys
;;
mvs)
basic_machine=i370-ibm
- basic_os=mvs
+ os=mvs
;;
nacl)
basic_machine=le32-unknown
- basic_os=nacl
+ os=nacl
;;
ncr3000)
basic_machine=i486-ncr
- basic_os=sysv4
+ os=sysv4
;;
netbsd386)
basic_machine=i386-pc
- basic_os=netbsd
+ os=netbsd
;;
netwinder)
basic_machine=armv4l-rebel
- basic_os=linux
+ os=linux
;;
news | news700 | news800 | news900)
basic_machine=m68k-sony
- basic_os=newsos
+ os=newsos
;;
news1000)
basic_machine=m68030-sony
- basic_os=newsos
+ os=newsos
;;
necv70)
basic_machine=v70-nec
- basic_os=sysv
+ os=sysv
;;
nh3000)
basic_machine=m68k-harris
- basic_os=cxux
+ os=cxux
;;
nh[45]000)
basic_machine=m88k-harris
- basic_os=cxux
+ os=cxux
;;
nindy960)
basic_machine=i960-intel
- basic_os=nindy
+ os=nindy
;;
mon960)
basic_machine=i960-intel
- basic_os=mon960
+ os=mon960
;;
nonstopux)
basic_machine=mips-compaq
- basic_os=nonstopux
+ os=nonstopux
;;
os400)
basic_machine=powerpc-ibm
- basic_os=os400
+ os=os400
;;
OSE68000 | ose68000)
basic_machine=m68000-ericsson
- basic_os=ose
+ os=ose
;;
os68k)
basic_machine=m68k-none
- basic_os=os68k
+ os=os68k
;;
paragon)
basic_machine=i860-intel
- basic_os=osf
+ os=osf
;;
parisc)
basic_machine=hppa-unknown
- basic_os=linux
- ;;
- psp)
- basic_machine=mipsallegrexel-sony
- basic_os=psp
+ os=linux
;;
pw32)
basic_machine=i586-unknown
- basic_os=pw32
+ os=pw32
;;
rdos | rdos64)
basic_machine=x86_64-pc
- basic_os=rdos
+ os=rdos
;;
rdos32)
basic_machine=i386-pc
- basic_os=rdos
+ os=rdos
;;
rom68k)
basic_machine=m68k-rom68k
- basic_os=coff
+ os=coff
;;
sa29200)
basic_machine=a29k-amd
- basic_os=udi
+ os=udi
;;
sei)
basic_machine=mips-sei
- basic_os=seiux
+ os=seiux
;;
sequent)
basic_machine=i386-sequent
- basic_os=
+ os=
;;
sps7)
basic_machine=m68k-bull
- basic_os=sysv2
+ os=sysv2
;;
st2000)
basic_machine=m68k-tandem
- basic_os=
+ os=
;;
stratus)
basic_machine=i860-stratus
- basic_os=sysv4
+ os=sysv4
;;
sun2)
basic_machine=m68000-sun
- basic_os=
+ os=
;;
sun2os3)
basic_machine=m68000-sun
- basic_os=sunos3
+ os=sunos3
;;
sun2os4)
basic_machine=m68000-sun
- basic_os=sunos4
+ os=sunos4
;;
sun3)
basic_machine=m68k-sun
- basic_os=
+ os=
;;
sun3os3)
basic_machine=m68k-sun
- basic_os=sunos3
+ os=sunos3
;;
sun3os4)
basic_machine=m68k-sun
- basic_os=sunos4
+ os=sunos4
;;
sun4)
basic_machine=sparc-sun
- basic_os=
+ os=
;;
sun4os3)
basic_machine=sparc-sun
- basic_os=sunos3
+ os=sunos3
;;
sun4os4)
basic_machine=sparc-sun
- basic_os=sunos4
+ os=sunos4
;;
sun4sol2)
basic_machine=sparc-sun
- basic_os=solaris2
+ os=solaris2
;;
sun386 | sun386i | roadrunner)
basic_machine=i386-sun
- basic_os=
+ os=
;;
sv1)
basic_machine=sv1-cray
- basic_os=unicos
+ os=unicos
;;
symmetry)
basic_machine=i386-sequent
- basic_os=dynix
+ os=dynix
;;
t3e)
basic_machine=alphaev5-cray
- basic_os=unicos
+ os=unicos
;;
t90)
basic_machine=t90-cray
- basic_os=unicos
+ os=unicos
;;
toad1)
basic_machine=pdp10-xkl
- basic_os=tops20
+ os=tops20
;;
tpf)
basic_machine=s390x-ibm
- basic_os=tpf
+ os=tpf
;;
udi29k)
basic_machine=a29k-amd
- basic_os=udi
+ os=udi
;;
ultra3)
basic_machine=a29k-nyu
- basic_os=sym1
+ os=sym1
;;
v810 | necv810)
basic_machine=v810-nec
- basic_os=none
+ os=none
;;
vaxv)
basic_machine=vax-dec
- basic_os=sysv
+ os=sysv
;;
vms)
basic_machine=vax-dec
- basic_os=vms
+ os=vms
;;
vsta)
basic_machine=i386-pc
- basic_os=vsta
+ os=vsta
;;
vxworks960)
basic_machine=i960-wrs
- basic_os=vxworks
+ os=vxworks
;;
vxworks68)
basic_machine=m68k-wrs
- basic_os=vxworks
+ os=vxworks
;;
vxworks29k)
basic_machine=a29k-wrs
- basic_os=vxworks
+ os=vxworks
;;
xbox)
basic_machine=i686-pc
- basic_os=mingw32
+ os=mingw32
;;
ymp)
basic_machine=ymp-cray
- basic_os=unicos
+ os=unicos
;;
*)
basic_machine=$1
- basic_os=
+ os=
;;
esac
;;
@@ -702,17 +683,17 @@ case $basic_machine in
bluegene*)
cpu=powerpc
vendor=ibm
- basic_os=cnk
+ os=cnk
;;
decsystem10* | dec10*)
cpu=pdp10
vendor=dec
- basic_os=tops10
+ os=tops10
;;
decsystem20* | dec20*)
cpu=pdp10
vendor=dec
- basic_os=tops20
+ os=tops20
;;
delta | 3300 | motorola-3300 | motorola-delta \
| 3300-motorola | delta-motorola)
@@ -722,7 +703,7 @@ case $basic_machine in
dpx2*)
cpu=m68k
vendor=bull
- basic_os=sysv3
+ os=sysv3
;;
encore | umax | mmax)
cpu=ns32k
@@ -731,7 +712,7 @@ case $basic_machine in
elxsi)
cpu=elxsi
vendor=elxsi
- basic_os=${basic_os:-bsd}
+ os=${os:-bsd}
;;
fx2800)
cpu=i860
@@ -744,7 +725,7 @@ case $basic_machine in
h3050r* | hiux*)
cpu=hppa1.1
vendor=hitachi
- basic_os=hiuxwe2
+ os=hiuxwe2
;;
hp3k9[0-9][0-9] | hp9[0-9][0-9])
cpu=hppa1.0
@@ -787,36 +768,36 @@ case $basic_machine in
i*86v32)
cpu=`echo "$1" | sed -e 's/86.*/86/'`
vendor=pc
- basic_os=sysv32
+ os=sysv32
;;
i*86v4*)
cpu=`echo "$1" | sed -e 's/86.*/86/'`
vendor=pc
- basic_os=sysv4
+ os=sysv4
;;
i*86v)
cpu=`echo "$1" | sed -e 's/86.*/86/'`
vendor=pc
- basic_os=sysv
+ os=sysv
;;
i*86sol2)
cpu=`echo "$1" | sed -e 's/86.*/86/'`
vendor=pc
- basic_os=solaris2
+ os=solaris2
;;
j90 | j90-cray)
cpu=j90
vendor=cray
- basic_os=${basic_os:-unicos}
+ os=${os:-unicos}
;;
iris | iris4d)
cpu=mips
vendor=sgi
- case $basic_os in
+ case $os in
irix*)
;;
*)
- basic_os=irix4
+ os=irix4
;;
esac
;;
@@ -827,26 +808,26 @@ case $basic_machine in
*mint | mint[0-9]* | *MiNT | *MiNT[0-9]*)
cpu=m68k
vendor=atari
- basic_os=mint
+ os=mint
;;
news-3600 | risc-news)
cpu=mips
vendor=sony
- basic_os=newsos
+ os=newsos
;;
next | m*-next)
cpu=m68k
vendor=next
- case $basic_os in
+ case $os in
openstep*)
;;
nextstep*)
;;
ns2*)
- basic_os=nextstep2
+ os=nextstep2
;;
*)
- basic_os=nextstep3
+ os=nextstep3
;;
esac
;;
@@ -857,12 +838,12 @@ case $basic_machine in
op50n-* | op60c-*)
cpu=hppa1.1
vendor=oki
- basic_os=proelf
+ os=proelf
;;
pa-hitachi)
cpu=hppa1.1
vendor=hitachi
- basic_os=hiuxwe2
+ os=hiuxwe2
;;
pbd)
cpu=sparc
@@ -899,12 +880,12 @@ case $basic_machine in
sde)
cpu=mipsisa32
vendor=sde
- basic_os=${basic_os:-elf}
+ os=${os:-elf}
;;
simso-wrs)
cpu=sparclite
vendor=wrs
- basic_os=vxworks
+ os=vxworks
;;
tower | tower-32)
cpu=m68k
@@ -921,7 +902,7 @@ case $basic_machine in
w89k-*)
cpu=hppa1.1
vendor=winbond
- basic_os=proelf
+ os=proelf
;;
none)
cpu=none
@@ -938,13 +919,11 @@ case $basic_machine in
*-*)
# shellcheck disable=SC2162
- saved_IFS=$IFS
IFS="-" read cpu vendor <<EOF
$basic_machine
EOF
- IFS=$saved_IFS
;;
- # We use 'pc' rather than 'unknown'
+ # We use `pc' rather than `unknown'
# because (1) that's what they normally are, and
# (2) the word "unknown" tends to confuse beginning users.
i*86 | x86_64)
@@ -976,11 +955,11 @@ case $cpu-$vendor in
# some cases the only manufacturer, in others, it is the most popular.
craynv-unknown)
vendor=cray
- basic_os=${basic_os:-unicosmp}
+ os=${os:-unicosmp}
;;
c90-unknown | c90-cray)
vendor=cray
- basic_os=${Basic_os:-unicos}
+ os=${os:-unicos}
;;
fx80-unknown)
vendor=alliant
@@ -1021,15 +1000,10 @@ case $cpu-$vendor in
;;
# Here we normalize CPU types with a missing or matching vendor
- armh-unknown | armh-alt)
- cpu=armv7l
- vendor=alt
- basic_os=${basic_os:-linux-gnueabihf}
- ;;
dpx20-unknown | dpx20-bull)
cpu=rs6000
vendor=bull
- basic_os=${basic_os:-bosx}
+ os=${os:-bosx}
;;
# Here we normalize CPU types irrespective of the vendor
@@ -1038,7 +1012,7 @@ case $cpu-$vendor in
;;
blackfin-*)
cpu=bfin
- basic_os=linux
+ os=linux
;;
c54x-*)
cpu=tic54x
@@ -1051,7 +1025,7 @@ case $cpu-$vendor in
;;
e500v[12]-*)
cpu=powerpc
- basic_os=${basic_os}"spe"
+ os=$os"spe"
;;
mips3*-*)
cpu=mips64
@@ -1061,7 +1035,7 @@ case $cpu-$vendor in
;;
m68knommu-*)
cpu=m68k
- basic_os=linux
+ os=linux
;;
m9s12z-* | m68hcs12z-* | hcs12z-* | s12z-*)
cpu=s12z
@@ -1071,12 +1045,12 @@ case $cpu-$vendor in
;;
parisc-*)
cpu=hppa
- basic_os=linux
+ os=linux
;;
pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
cpu=i586
;;
- pentiumpro-* | p6-* | 6x86-* | athlon-* | athlon_*-*)
+ pentiumpro-* | p6-* | 6x86-* | athlon-* | athalon_*-*)
cpu=i686
;;
pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
@@ -1127,14 +1101,11 @@ case $cpu-$vendor in
xscale-* | xscalee[bl]-*)
cpu=`echo "$cpu" | sed 's/^xscale/arm/'`
;;
- arm64-* | aarch64le-*)
- cpu=aarch64
- ;;
# Recognize the canonical CPU Types that limit and/or modify the
# company names they are paired with.
cr16-*)
- basic_os=${basic_os:-elf}
+ os=${os:-elf}
;;
crisv32-* | etraxfs*-*)
cpu=crisv32
@@ -1145,7 +1116,7 @@ case $cpu-$vendor in
vendor=axis
;;
crx-*)
- basic_os=${basic_os:-elf}
+ os=${os:-elf}
;;
neo-tandem)
cpu=neo
@@ -1167,12 +1138,16 @@ case $cpu-$vendor in
cpu=nsx
vendor=tandem
;;
- mipsallegrexel-sony)
- cpu=mipsallegrexel
- vendor=sony
+ s390-*)
+ cpu=s390
+ vendor=ibm
+ ;;
+ s390x-*)
+ cpu=s390x
+ vendor=ibm
;;
tile*-*)
- basic_os=${basic_os:-linux-gnu}
+ os=${os:-linux-gnu}
;;
*)
@@ -1181,15 +1156,15 @@ case $cpu-$vendor in
case $cpu in
1750a | 580 \
| a29k \
- | aarch64 | aarch64_be | aarch64c | arm64ec \
+ | aarch64 | aarch64_be \
| abacus \
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] \
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \
| alphapca5[67] | alpha64pca5[67] \
| am33_2.0 \
| amdgcn \
- | arc | arceb | arc32 | arc64 \
- | arm | arm[lb]e | arme[lb] | armv* \
+ | arc | arceb \
+ | arm | arm[lb]e | arme[lb] | armv* \
| avr | avr32 \
| asmjs \
| ba \
@@ -1200,29 +1175,45 @@ case $cpu-$vendor in
| d10v | d30v | dlx | dsp16xx \
| e2k | elxsi | epiphany \
| f30[01] | f700 | fido | fr30 | frv | ft32 | fx80 \
- | javascript \
| h8300 | h8500 \
| hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| hexagon \
| i370 | i*86 | i860 | i960 | ia16 | ia64 \
| ip2k | iq2000 \
| k1om \
- | kvx \
| le32 | le64 \
| lm32 \
- | loongarch32 | loongarch64 \
| m32c | m32r | m32rle \
| m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \
| m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \
| m88110 | m88k | maxq | mb | mcore | mep | metag \
| microblaze | microblazeel \
- | mips* \
+ | mips | mipsbe | mipseb | mipsel | mipsle \
+ | mips16 \
+ | mips64 | mips64eb | mips64el \
+ | mips64octeon | mips64octeonel \
+ | mips64orion | mips64orionel \
+ | mips64r5900 | mips64r5900el \
+ | mips64vr | mips64vrel \
+ | mips64vr4100 | mips64vr4100el \
+ | mips64vr4300 | mips64vr4300el \
+ | mips64vr5000 | mips64vr5000el \
+ | mips64vr5900 | mips64vr5900el \
+ | mipsisa32 | mipsisa32el \
+ | mipsisa32r2 | mipsisa32r2el \
+ | mipsisa32r6 | mipsisa32r6el \
+ | mipsisa64 | mipsisa64el \
+ | mipsisa64r2 | mipsisa64r2el \
+ | mipsisa64r6 | mipsisa64r6el \
+ | mipsisa64sb1 | mipsisa64sb1el \
+ | mipsisa64sr71k | mipsisa64sr71kel \
+ | mipsr5900 | mipsr5900el \
+ | mipstx39 | mipstx39el \
| mmix \
| mn10200 | mn10300 \
| moxie \
| mt \
| msp430 \
- | nanomips* \
| nds32 | nds32le | nds32be \
| nfp \
| nios | nios2 | nios2eb | nios2el \
@@ -1236,9 +1227,8 @@ case $cpu-$vendor in
| powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \
| pru \
| pyramid \
- | riscv | riscv32 | riscv32be | riscv64 | riscv64be \
+ | riscv | riscv32 | riscv64 \
| rl78 | romp | rs6000 | rx \
- | s390 | s390x \
| score \
| sh | shl \
| sh[1234] | sh[24]a | sh[24]ae[lb] | sh[23]e | she[lb] | sh[lb]e \
@@ -1248,13 +1238,11 @@ case $cpu-$vendor in
| sparcv8 | sparcv9 | sparcv9b | sparcv9v | sv1 | sx* \
| spu \
| tahoe \
- | thumbv7* \
| tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \
| tron \
| ubicom32 \
| v70 | v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \
| vax \
- | vc4 \
| visium \
| w65 \
| wasm32 | wasm64 \
@@ -1266,7 +1254,7 @@ case $cpu-$vendor in
;;
*)
- echo "Invalid configuration '$1': machine '$cpu-$vendor' not recognized" 1>&2
+ echo Invalid configuration \`"$1"\': machine \`"$cpu-$vendor"\' not recognized 1>&2
exit 1
;;
esac
@@ -1287,54 +1275,8 @@ esac
# Decode manufacturer-specific aliases for certain operating systems.
-if test x"$basic_os" != x
+if [ x$os != x ]
then
-
-# First recognize some ad-hoc cases, or perhaps split kernel-os, or else just
-# set os.
-obj=
-case $basic_os in
- gnu/linux*)
- kernel=linux
- os=`echo "$basic_os" | sed -e 's|gnu/linux|gnu|'`
- ;;
- os2-emx)
- kernel=os2
- os=`echo "$basic_os" | sed -e 's|os2-emx|emx|'`
- ;;
- nto-qnx*)
- kernel=nto
- os=`echo "$basic_os" | sed -e 's|nto-qnx|qnx|'`
- ;;
- *-*)
- # shellcheck disable=SC2162
- saved_IFS=$IFS
- IFS="-" read kernel os <<EOF
-$basic_os
-EOF
- IFS=$saved_IFS
- ;;
- # Default OS when just kernel was specified
- nto*)
- kernel=nto
- os=`echo "$basic_os" | sed -e 's|nto|qnx|'`
- ;;
- linux*)
- kernel=linux
- os=`echo "$basic_os" | sed -e 's|linux|gnu|'`
- ;;
- managarm*)
- kernel=managarm
- os=`echo "$basic_os" | sed -e 's|managarm|mlibc|'`
- ;;
- *)
- kernel=
- os=$basic_os
- ;;
-esac
-
-# Now, normalize the OS (knowing we just have one component, it's not a kernel,
-# etc.)
case $os in
# First match some system type aliases that might get confused
# with valid system types.
@@ -1346,7 +1288,7 @@ case $os in
os=cnk
;;
solaris1 | solaris1.*)
- os=`echo "$os" | sed -e 's|solaris1|sunos4|'`
+ os=`echo $os | sed -e 's|solaris1|sunos4|'`
;;
solaris)
os=solaris2
@@ -1354,6 +1296,9 @@ case $os in
unixware*)
os=sysv4.2uw
;;
+ gnu/linux*)
+ os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
+ ;;
# es1800 is here to avoid being matched by es* (a different OS)
es1800*)
os=ose
@@ -1375,9 +1320,12 @@ case $os in
os=sco3.2v4
;;
sco3.2.[4-9]*)
- os=`echo "$os" | sed -e 's/sco3.2./sco3.2v/'`
+ os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
+ ;;
+ sco3.2v[4-9]* | sco5v6*)
+ # Don't forget version if it is 3.2v4 or newer.
;;
- sco*v* | scout)
+ scout)
# Don't match below
;;
sco*)
@@ -1386,25 +1334,78 @@ case $os in
psos*)
os=psos
;;
+ # Now accept the basic system types.
+ # The portable systems comes first.
+ # Each alternative MUST end in a * to match a version number.
+ # sysv* is not here because it comes later, after sysvr4.
+ gnu* | bsd* | mach* | minix* | genix* | ultrix* | irix* \
+ | *vms* | esix* | aix* | cnk* | sunos | sunos[34]*\
+ | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
+ | sym* | kopensolaris* | plan9* \
+ | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \
+ | aos* | aros* | cloudabi* | sortix* | twizzler* \
+ | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \
+ | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \
+ | knetbsd* | mirbsd* | netbsd* \
+ | bitrig* | openbsd* | solidbsd* | libertybsd* | os108* \
+ | ekkobsd* | kfreebsd* | freebsd* | riscix* | lynxos* \
+ | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \
+ | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \
+ | udi* | eabi* | lites* | ieee* | go32* | aux* | hcos* \
+ | chorusrdb* | cegcc* | glidix* \
+ | cygwin* | msys* | pe* | moss* | proelf* | rtems* \
+ | midipix* | mingw32* | mingw64* | linux-gnu* | linux-android* \
+ | linux-newlib* | linux-musl* | linux-uclibc* \
+ | uxpv* | beos* | mpeix* | udk* | moxiebox* \
+ | interix* | uwin* | mks* | rhapsody* | darwin* \
+ | openstep* | oskit* | conix* | pw32* | nonstopux* \
+ | storm-chaos* | tops10* | tenex* | tops20* | its* \
+ | os2* | vos* | palmos* | uclinux* | nucleus* \
+ | morphos* | superux* | rtmk* | windiss* \
+ | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \
+ | skyos* | haiku* | rdos* | toppers* | drops* | es* \
+ | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
+ | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
+ | nsk* | powerunix)
+ # Remember, each alternative MUST END IN *, to match a version number.
+ ;;
qnx*)
- os=qnx
+ case $cpu in
+ x86 | i*86)
+ ;;
+ *)
+ os=nto-$os
+ ;;
+ esac
;;
hiux*)
os=hiuxwe2
;;
+ nto-qnx*)
+ ;;
+ nto*)
+ os=`echo $os | sed -e 's|nto|nto-qnx|'`
+ ;;
+ sim | xray | os68k* | v88r* \
+ | windows* | osx | abug | netware* | os9* \
+ | macos* | mpw* | magic* | mmixware* | mon960* | lnews*)
+ ;;
+ linux-dietlibc)
+ os=linux-dietlibc
+ ;;
+ linux*)
+ os=`echo $os | sed -e 's|linux|linux-gnu|'`
+ ;;
lynx*178)
os=lynxos178
;;
lynx*5)
os=lynxos5
;;
- lynxos*)
- # don't get caught up in next wildcard
- ;;
lynx*)
os=lynxos
;;
- mac[0-9]*)
+ mac*)
os=`echo "$os" | sed -e 's|mac|macos|'`
;;
opened*)
@@ -1451,7 +1452,7 @@ case $os in
;;
# Preserve the version number of sinix5.
sinix5.*)
- os=`echo "$os" | sed -e 's|sinix|sysv|'`
+ os=`echo $os | sed -e 's|sinix|sysv|'`
;;
sinix*)
os=sysv4
@@ -1474,12 +1475,18 @@ case $os in
sysvr4)
os=sysv4
;;
+ # This must come after sysvr4.
+ sysv*)
+ ;;
ose*)
os=ose
;;
*mint | mint[0-9]* | *MiNT | MiNT[0-9]*)
os=mint
;;
+ zvmoe)
+ os=zvmoe
+ ;;
dicos*)
os=dicos
;;
@@ -1492,21 +1499,23 @@ case $os in
os=eabi
;;
*)
- os=
- obj=elf
+ os=elf
;;
esac
;;
- aout* | coff* | elf* | pe*)
- # These are machine code file formats, not OSes
- obj=$os
- os=
+ nacl*)
+ ;;
+ ios)
+ ;;
+ none)
+ ;;
+ *-eabi)
;;
*)
- # No normalization, but not necessarily accepted, that comes below.
+ echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2
+ exit 1
;;
esac
-
else
# Here we handle the default operating systems that come with various machines.
@@ -1519,54 +1528,42 @@ else
# will signal an error saying that MANUFACTURER isn't an operating
# system, and we'll never get to this point.
-kernel=
-obj=
case $cpu-$vendor in
score-*)
- os=
- obj=elf
+ os=elf
;;
spu-*)
- os=
- obj=elf
+ os=elf
;;
*-acorn)
os=riscix1.2
;;
arm*-rebel)
- kernel=linux
- os=gnu
+ os=linux
;;
arm*-semi)
- os=
- obj=aout
+ os=aout
;;
c4x-* | tic4x-*)
- os=
- obj=coff
+ os=coff
;;
c8051-*)
- os=
- obj=elf
+ os=elf
;;
clipper-intergraph)
os=clix
;;
hexagon-*)
- os=
- obj=elf
+ os=elf
;;
tic54x-*)
- os=
- obj=coff
+ os=coff
;;
tic55x-*)
- os=
- obj=coff
+ os=coff
;;
tic6x-*)
- os=
- obj=coff
+ os=coff
;;
# This must come before the *-dec entry.
pdp10-*)
@@ -1588,24 +1585,19 @@ case $cpu-$vendor in
os=sunos3
;;
m68*-cisco)
- os=
- obj=aout
+ os=aout
;;
mep-*)
- os=
- obj=elf
+ os=elf
;;
mips*-cisco)
- os=
- obj=elf
+ os=elf
;;
- mips*-*|nanomips*-*)
- os=
- obj=elf
+ mips*-*)
+ os=elf
;;
or32-*)
- os=
- obj=coff
+ os=coff
;;
*-tti) # must be before sparc entry or we get the wrong os.
os=sysv3
@@ -1614,8 +1606,7 @@ case $cpu-$vendor in
os=sunos4.1.1
;;
pru-*)
- os=
- obj=elf
+ os=elf
;;
*-be)
os=beos
@@ -1696,12 +1687,10 @@ case $cpu-$vendor in
os=uxpv
;;
*-rom68k)
- os=
- obj=coff
+ os=coff
;;
*-*bug)
- os=
- obj=coff
+ os=coff
;;
*-apple)
os=macos
@@ -1716,251 +1705,84 @@ case $cpu-$vendor in
os=none
;;
esac
-
fi
-# Now, validate our (potentially fixed-up) individual pieces (OS, OBJ).
-
-case $os in
- # Sometimes we do "kernel-libc", so those need to count as OSes.
- llvm* | musl* | newlib* | relibc* | uclibc*)
- ;;
- # Likewise for "kernel-abi"
- eabi* | gnueabi*)
- ;;
- # VxWorks passes extra cpu info in the 4th filed.
- simlinux | simwindows | spe)
- ;;
- # See `case $cpu-$os` validation below
- ghcjs)
- ;;
- # Now accept the basic system types.
- # The portable systems comes first.
- # Each alternative MUST end in a * to match a version number.
- gnu* | android* | bsd* | mach* | minix* | genix* | ultrix* | irix* \
- | *vms* | esix* | aix* | cnk* | sunos | sunos[34]* \
- | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \
- | sym* | plan9* | psp* | sim* | xray* | os68k* | v88r* \
- | hiux* | abug | nacl* | netware* | windows* \
- | os9* | macos* | osx* | ios* | tvos* | watchos* \
- | mpw* | magic* | mmixware* | mon960* | lnews* \
- | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \
- | aos* | aros* | cloudabi* | sortix* | twizzler* \
- | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \
- | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \
- | mirbsd* | netbsd* | dicos* | openedition* | ose* \
- | bitrig* | openbsd* | secbsd* | solidbsd* | libertybsd* | os108* \
- | ekkobsd* | freebsd* | riscix* | lynxos* | os400* \
- | bosx* | nextstep* | cxux* | oabi* \
- | ptx* | ecoff* | winnt* | domain* | vsta* \
- | udi* | lites* | ieee* | go32* | aux* | hcos* \
- | chorusrdb* | cegcc* | glidix* | serenity* \
- | cygwin* | msys* | moss* | proelf* | rtems* \
- | midipix* | mingw32* | mingw64* | mint* \
- | uxpv* | beos* | mpeix* | udk* | moxiebox* \
- | interix* | uwin* | mks* | rhapsody* | darwin* \
- | openstep* | oskit* | conix* | pw32* | nonstopux* \
- | storm-chaos* | tops10* | tenex* | tops20* | its* \
- | os2* | vos* | palmos* | uclinux* | nucleus* | morphos* \
- | scout* | superux* | sysv* | rtmk* | tpf* | windiss* \
- | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \
- | skyos* | haiku* | rdos* | toppers* | drops* | es* \
- | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \
- | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \
- | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \
- | fiwix* | mlibc* | cos* | mbr* | ironclad* )
- ;;
- # This one is extra strict with allowed versions
- sco3.2v2 | sco3.2v[4-9]* | sco5v6*)
- # Don't forget version if it is 3.2v4 or newer.
- ;;
- # This refers to builds using the UEFI calling convention
- # (which depends on the architecture) and PE file format.
- # Note that this is both a different calling convention and
- # different file format than that of GNU-EFI
- # (x86_64-w64-mingw32).
- uefi)
- ;;
- none)
- ;;
- kernel* | msvc* )
- # Restricted further below
- ;;
- '')
- if test x"$obj" = x
- then
- echo "Invalid configuration '$1': Blank OS only allowed with explicit machine code file format" 1>&2
- fi
- ;;
- *)
- echo "Invalid configuration '$1': OS '$os' not recognized" 1>&2
- exit 1
- ;;
-esac
-
-case $obj in
- aout* | coff* | elf* | pe*)
- ;;
- '')
- # empty is fine
- ;;
- *)
- echo "Invalid configuration '$1': Machine code format '$obj' not recognized" 1>&2
- exit 1
- ;;
-esac
-
-# Here we handle the constraint that a (synthetic) cpu and os are
-# valid only in combination with each other and nowhere else.
-case $cpu-$os in
- # The "javascript-unknown-ghcjs" triple is used by GHC; we
- # accept it here in order to tolerate that, but reject any
- # variations.
- javascript-ghcjs)
- ;;
- javascript-* | *-ghcjs)
- echo "Invalid configuration '$1': cpu '$cpu' is not valid with os '$os$obj'" 1>&2
- exit 1
- ;;
-esac
-
-# As a final step for OS-related things, validate the OS-kernel combination
-# (given a valid OS), if there is a kernel.
-case $kernel-$os-$obj in
- linux-gnu*- | linux-android*- | linux-dietlibc*- | linux-llvm*- \
- | linux-mlibc*- | linux-musl*- | linux-newlib*- \
- | linux-relibc*- | linux-uclibc*- )
- ;;
- uclinux-uclibc*- )
- ;;
- managarm-mlibc*- | managarm-kernel*- )
- ;;
- windows*-msvc*-)
- ;;
- -dietlibc*- | -llvm*- | -mlibc*- | -musl*- | -newlib*- | -relibc*- \
- | -uclibc*- )
- # These are just libc implementations, not actual OSes, and thus
- # require a kernel.
- echo "Invalid configuration '$1': libc '$os' needs explicit kernel." 1>&2
- exit 1
- ;;
- -kernel*- )
- echo "Invalid configuration '$1': '$os' needs explicit kernel." 1>&2
- exit 1
- ;;
- *-kernel*- )
- echo "Invalid configuration '$1': '$kernel' does not support '$os'." 1>&2
- exit 1
- ;;
- *-msvc*- )
- echo "Invalid configuration '$1': '$os' needs 'windows'." 1>&2
- exit 1
- ;;
- kfreebsd*-gnu*- | kopensolaris*-gnu*-)
- ;;
- vxworks-simlinux- | vxworks-simwindows- | vxworks-spe-)
- ;;
- nto-qnx*-)
- ;;
- os2-emx-)
- ;;
- *-eabi*- | *-gnueabi*-)
- ;;
- none--*)
- # None (no kernel, i.e. freestanding / bare metal),
- # can be paired with an machine code file format
- ;;
- -*-)
- # Blank kernel with real OS is always fine.
- ;;
- --*)
- # Blank kernel and OS with real machine code file format is always fine.
- ;;
- *-*-*)
- echo "Invalid configuration '$1': Kernel '$kernel' not known to work with OS '$os'." 1>&2
- exit 1
- ;;
-esac
-
# Here we handle the case where we know the os, and the CPU type, but not the
# manufacturer. We pick the logical manufacturer.
case $vendor in
unknown)
- case $cpu-$os in
- *-riscix*)
+ case $os in
+ riscix*)
vendor=acorn
;;
- *-sunos*)
+ sunos*)
vendor=sun
;;
- *-cnk* | *-aix*)
+ cnk*|-aix*)
vendor=ibm
;;
- *-beos*)
+ beos*)
vendor=be
;;
- *-hpux*)
+ hpux*)
vendor=hp
;;
- *-mpeix*)
+ mpeix*)
vendor=hp
;;
- *-hiux*)
+ hiux*)
vendor=hitachi
;;
- *-unos*)
+ unos*)
vendor=crds
;;
- *-dgux*)
+ dgux*)
vendor=dg
;;
- *-luna*)
+ luna*)
vendor=omron
;;
- *-genix*)
+ genix*)
vendor=ns
;;
- *-clix*)
+ clix*)
vendor=intergraph
;;
- *-mvs* | *-opened*)
- vendor=ibm
- ;;
- *-os400*)
+ mvs* | opened*)
vendor=ibm
;;
- s390-* | s390x-*)
+ os400*)
vendor=ibm
;;
- *-ptx*)
+ ptx*)
vendor=sequent
;;
- *-tpf*)
+ tpf*)
vendor=ibm
;;
- *-vxsim* | *-vxworks* | *-windiss*)
+ vxsim* | vxworks* | windiss*)
vendor=wrs
;;
- *-aux*)
+ aux*)
vendor=apple
;;
- *-hms*)
+ hms*)
vendor=hitachi
;;
- *-mpw* | *-macos*)
+ mpw* | macos*)
vendor=apple
;;
- *-*mint | *-mint[0-9]* | *-*MiNT | *-MiNT[0-9]*)
+ *mint | mint[0-9]* | *MiNT | MiNT[0-9]*)
vendor=atari
;;
- *-vos*)
+ vos*)
vendor=stratus
;;
esac
;;
esac
-echo "$cpu-$vendor${kernel:+-$kernel}${os:+-$os}${obj:+-$obj}"
+echo "$cpu-$vendor-$os"
exit
# Local variables:
diff --git a/Build/source/utils/asymptote/configure b/Build/source/utils/asymptote/configure
index beeac6ac8ba..2c74316ae68 100755
--- a/Build/source/utils/asymptote/configure
+++ b/Build/source/utils/asymptote/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.71 for Asymptote 2.85.
+# Generated by GNU Autoconf 2.71 for Asymptote 2.87.
#
# Report bugs to <https://github.com/vectorgraphics/asymptote/issues>.
#
@@ -611,8 +611,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='Asymptote'
PACKAGE_TARNAME='asymptote'
-PACKAGE_VERSION='2.85'
-PACKAGE_STRING='Asymptote 2.85'
+PACKAGE_VERSION='2.87'
+PACKAGE_STRING='Asymptote 2.87'
PACKAGE_BUGREPORT='https://github.com/vectorgraphics/asymptote/issues'
PACKAGE_URL=''
@@ -1325,7 +1325,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures Asymptote 2.85 to adapt to many kinds of systems.
+\`configure' configures Asymptote 2.87 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1391,7 +1391,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Asymptote 2.85:";;
+ short | recursive ) echo "Configuration of Asymptote 2.87:";;
esac
cat <<\_ACEOF
@@ -1506,7 +1506,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Asymptote configure 2.85
+Asymptote configure 2.87
generated by GNU Autoconf 2.71
Copyright (C) 2021 Free Software Foundation, Inc.
@@ -1986,7 +1986,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Asymptote $as_me 2.85, which was
+It was created by Asymptote $as_me 2.87, which was
generated by GNU Autoconf 2.71. Invocation command line was
$ $0$ac_configure_args_raw
@@ -6694,7 +6694,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
ASYGLVERSION=1.02
-GCVERSION=8.2.0
+GCVERSION=8.2.4
ATOMICVERSION=7.6.12
GCFILE=gc-$GCVERSION
@@ -6740,7 +6740,7 @@ GCPPLIB=
INCL="-I."
GCNAME="Boehm Garbage Collector"
if test "x$ac_cv_use_gc" != "xno" ; then
- OPTIONS=$OPTIONS"-DUSEGC "
+ OPTIONS=$OPTIONS"-DUSEGC -DLSPCPP_USEGC "
case _$ac_cv_use_gc in
_|_system|_*[\\/]*)
if test "x$ac_cv_use_gc" = "xsystem" ; then
@@ -10280,7 +10280,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Asymptote $as_me 2.85, which was
+This file was extended by Asymptote $as_me 2.87, which was
generated by GNU Autoconf 2.71. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -10344,7 +10344,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config='$ac_cs_config_escaped'
ac_cs_version="\\
-Asymptote config.status 2.85
+Asymptote config.status 2.87
configured by $0, generated by GNU Autoconf 2.71,
with options \\"\$ac_cs_config\\"
diff --git a/Build/source/utils/asymptote/configure.ac b/Build/source/utils/asymptote/configure.ac
index c1bb28f29cf..f6a5b5d9a1e 100644
--- a/Build/source/utils/asymptote/configure.ac
+++ b/Build/source/utils/asymptote/configure.ac
@@ -3,7 +3,7 @@
# this file.
AC_PREREQ(2)
-AC_INIT([Asymptote],[2.85],[https://github.com/vectorgraphics/asymptote/issues])
+AC_INIT([Asymptote],[2.87],[https://github.com/vectorgraphics/asymptote/issues])
VERSION=$PACKAGE_VERSION
AC_SUBST(VERSION)
m4_include([ax_pthread.m4])
@@ -157,7 +157,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
ASYGLVERSION=1.02
-GCVERSION=8.2.0
+GCVERSION=8.2.4
ATOMICVERSION=7.6.12
GCFILE=gc-$GCVERSION
@@ -182,7 +182,7 @@ GCPPLIB=
INCL="-I."
GCNAME="Boehm Garbage Collector"
if test "x$ac_cv_use_gc" != "xno" ; then
- OPTIONS=$OPTIONS"-DUSEGC "
+ OPTIONS=$OPTIONS"-DUSEGC -DLSPCPP_USEGC "
case _$ac_cv_use_gc in
_|_system|_*[[\\/]]*)
if test "x$ac_cv_use_gc" = "xsystem" ; then
diff --git a/Build/source/utils/asymptote/cudareflect/tinyexr/tinyexr.h b/Build/source/utils/asymptote/cudareflect/tinyexr/tinyexr.h
index a5e868b99a9..8bc7cd1d44c 100644
--- a/Build/source/utils/asymptote/cudareflect/tinyexr/tinyexr.h
+++ b/Build/source/utils/asymptote/cudareflect/tinyexr/tinyexr.h
@@ -6777,7 +6777,6 @@ static int EncodeChunk(const EXRImage* exr_image, const EXRHeader* exr_header,
if (exr_image->tiles) {
const EXRImage* level_image = exr_image;
size_t block_idx = 0;
- tinyexr::tinyexr_uint64 block_data_size = 0;
int num_levels = (exr_header->tile_level_mode != TINYEXR_TILE_RIPMAP_LEVELS) ?
offset_data.num_x_levels : (offset_data.num_x_levels * offset_data.num_y_levels);
for (int level_index = 0; level_index < num_levels; ++level_index) {
@@ -6825,7 +6824,6 @@ static int EncodeChunk(const EXRImage* exr_image, const EXRHeader* exr_header,
offset_data.offsets[level_index][j][i] = offset;
swap8(reinterpret_cast<tinyexr_uint64*>(&offset_data.offsets[level_index][j][i]));
offset += data_list[block_idx].size() + doffset;
- block_data_size += data_list[block_idx].size();
++block_idx;
}
level_image = level_image->next_level;
diff --git a/Build/source/utils/asymptote/dec.cc b/Build/source/utils/asymptote/dec.cc
index 84ccb937ce0..794af9b2f8e 100644
--- a/Build/source/utils/asymptote/dec.cc
+++ b/Build/source/utils/asymptote/dec.cc
@@ -18,6 +18,7 @@
#include "runtime.h"
#include "locate.h"
#include "parser.h"
+// #include "builtin.h" // for trans::addRecordOps
namespace absyntax {
@@ -60,9 +61,9 @@ void dimensions::prettyprint(ostream &out, Int indent)
out << "dimensions (" << depth << ")\n";
}
-types::array *dimensions::truetype(types::ty *base)
+types::array *dimensions::truetype(types::ty *base, bool tacit)
{
- if (base->kind == ty_void) {
+ if (!tacit && base->kind == ty_void) {
em.error(getPos());
em << "cannot declare array of type void";
}
@@ -109,7 +110,7 @@ types::ty *arrayTy::trans(coenv &e, bool tacit)
if (ct->kind == types::ty_error)
return ct;
- types::array *t = dims->truetype(ct);
+ types::array *t = dims->truetype(ct,tacit);
assert(t);
return t;
@@ -167,22 +168,63 @@ void block::prettyprint(ostream &out, Int indent)
prettystms(out, indent+1);
}
+// Uses RAII to ensure scope is ended when function returns.
+class Scope {
+ coenv* e;
+public:
+ Scope(coenv &e, bool scope) : e(scope ? &e : nullptr) {
+ if (this->e) this->e->e.beginScope();
+ }
+ ~Scope() {
+ if (this->e) e->e.endScope();
+ }
+};
+
+
void block::trans(coenv &e)
{
- if (scope) e.e.beginScope();
+ Scope scopeHolder(e, scope);
for (list<runnable *>::iterator p = stms.begin(); p != stms.end(); ++p) {
(*p)->markTrans(e);
}
- if (scope) e.e.endScope();
}
void block::transAsField(coenv &e, record *r)
{
- if (scope) e.e.beginScope();
+ Scope scopeHolder(e, scope);
for (list<runnable *>::iterator p = stms.begin(); p != stms.end(); ++p) {
(*p)->markTransAsField(e, r);
+ if (em.errors() && !settings::getSetting<bool>("debug"))
+ break;
+ }
+}
+
+bool block::transAsTemplatedField(
+ coenv &e, record *r, mem::vector<absyntax::namedTyEntry*>* args
+) {
+ Scope scopeHolder(e, scope);
+ auto p = stms.begin();
+ if (p == stms.end()) {
+ return true; // empty file
+ }
+ receiveTypedefDec *dec = dynamic_cast<receiveTypedefDec *>(*p);
+ if (!dec) {
+ em.error(getPos());
+ em << "expected 'typedef import(<types>);'";
+ em.sync();
+ return false;
+ }
+ if(!dec->transAsParamMatcher(e, r, args))
+ return false;
+
+ while (++p != stms.end()) {
+ (*p)->markTransAsField(e, r);
+ if (em.errors() && !settings::getSetting<bool>("debug")) {
+ return false;
+ }
}
- if (scope) e.e.endScope();
+ em.sync();
+ return true;
}
void block::transAsRecordBody(coenv &e, record *r)
@@ -191,6 +233,14 @@ void block::transAsRecordBody(coenv &e, record *r)
e.c.closeRecord();
}
+bool block::transAsTemplatedRecordBody(
+ coenv &e, record *r, mem::vector<absyntax::namedTyEntry*> *args
+) {
+ bool succeeded = transAsTemplatedField(e, r, args);
+ e.c.closeRecord();
+ return succeeded;
+}
+
record *block::transAsFile(genv& ge, symbol id)
{
// Create the new module.
@@ -208,10 +258,37 @@ record *block::transAsFile(genv& ge, symbol id)
}
transAsRecordBody(ce, r);
em.sync();
+ if (em.errors()) return nullptr;
return r;
}
+record *block::transAsTemplatedFile(
+ genv& ge, symbol id, mem::vector<absyntax::namedTyEntry*>* args
+) {
+ // Create the new module.
+ record *r = new record(id, new frame(id,0,0));
+
+ // Create coder and environment to translate the module.
+ // File-level modules have dynamic fields by default.
+ coder c(getPos(), r, 0);
+ env e(ge);
+ coenv ce(c, e);
+
+ // Translate the abstract syntax.
+ if (settings::getSetting<bool>("autoplain")) {
+ autoplainRunnable()->transAsField(ce, r);
+ }
+
+ bool succeeded = transAsTemplatedRecordBody(ce, r, args);
+ if (!succeeded) {
+ return nullptr;
+ }
+
+ return r;
+}
+
+
bool block::returns() {
// Search for a returning runnable, starting at the end for efficiency.
for (list<runnable *>::reverse_iterator p=stms.rbegin();
@@ -386,9 +463,10 @@ trans::tyEntry *decidstart::getTyEntry(trans::tyEntry *base, coenv &e,
void decidstart::addOps(types::ty *base, coenv &e, record *r)
{
if (dims) {
- e.e.addArrayOps(dims->truetype(base));
+ array *a=dims->truetype(base);
+ e.e.addArrayOps(a);
if (r)
- r->e.addArrayOps(dims->truetype(base));
+ r->e.addArrayOps(a);
}
}
@@ -409,8 +487,9 @@ void decidstart::createSymMap(AsymptoteLsp::SymbolContext* symContext)
#endif
}
-void decidstart::createSymMapWType(AsymptoteLsp::SymbolContext* symContext, absyntax::ty* base)
-{
+void decidstart::createSymMapWType(
+ AsymptoteLsp::SymbolContext* symContext, absyntax::ty* base
+) {
#ifdef HAVE_LSP
std::string name(static_cast<std::string>(getName()));
AsymptoteLsp::posInFile pos(getPos().LineColumn());
@@ -418,20 +497,26 @@ void decidstart::createSymMapWType(AsymptoteLsp::SymbolContext* symContext, absy
{
if (base == nullptr)
{
- decCtx->additionalDecs.emplace(std::piecewise_construct, std::forward_as_tuple(name),
+ decCtx->additionalDecs.emplace(std::piecewise_construct,
+ std::forward_as_tuple(name),
std::forward_as_tuple(name, pos));
}
else
{
- decCtx->additionalDecs.emplace(std::piecewise_construct, std::forward_as_tuple(name),
- std::forward_as_tuple(name, static_cast<std::string>(*base), pos));
+ decCtx->additionalDecs.emplace(
+ std::piecewise_construct,
+ std::forward_as_tuple(name),
+ std::forward_as_tuple(name, static_cast<std::string>(*base), pos)
+ );
}
}
else
{
symContext->symMap.varDec[name] = base == nullptr ?
AsymptoteLsp::SymbolInfo(name, pos) :
- AsymptoteLsp::SymbolInfo(name, static_cast<std::string>(*base), pos);
+ AsymptoteLsp::SymbolInfo(name,
+ static_cast<std::string>(*base),
+ pos);
}
#endif
}
@@ -550,14 +635,19 @@ types::ty *inferType(position pos, coenv &e, varinit *init)
}
exp *base = dynamic_cast<exp *>(init);
+ bool Void=false;
+
if (base) {
types::ty *t = base->cgetType(e);
- if (t->kind != ty_overloaded)
+ Void=t->kind == ty_void;
+ if (t->kind != ty_overloaded && !Void)
return t;
}
em.error(pos);
- em << "could not infer type of initializer";
+ em << (Void ? "cannot infer from void" :
+ "could not infer type of initializer");
+
return primError();
}
@@ -639,8 +729,9 @@ void decid::createSymMap(AsymptoteLsp::SymbolContext* symContext)
#endif
}
-void decid::createSymMapWType(AsymptoteLsp::SymbolContext* symContext, absyntax::ty* base)
-{
+void decid::createSymMapWType(
+ AsymptoteLsp::SymbolContext* symContext, absyntax::ty* base
+) {
#ifdef HAVE_LSP
start->createSymMapWType(symContext, base);
if (init)
@@ -680,7 +771,9 @@ void decidlist::createSymMap(AsymptoteLsp::SymbolContext* symContext) {
#endif
}
-void decidlist::createSymMapWType(AsymptoteLsp::SymbolContext* symContext, absyntax::ty* base) {
+void decidlist::createSymMapWType(
+ AsymptoteLsp::SymbolContext* symContext, absyntax::ty* base
+) {
#ifdef HAVE_LSP
for (auto const& p : decs)
{
@@ -690,7 +783,7 @@ void decidlist::createSymMapWType(AsymptoteLsp::SymbolContext* symContext, absyn
}
- void vardec::prettyprint(ostream &out, Int indent)
+void vardec::prettyprint(ostream &out, Int indent)
{
prettyname(out, "vardec",indent, getPos());
@@ -738,7 +831,7 @@ class loadModuleExp : public exp {
public:
loadModuleExp(position pos, record *imp)
- : exp(pos) {ft=new function(imp,primString());}
+ : exp(pos) {ft=new function(imp,primString(),primString());}
void prettyprint(ostream &out, Int indent) {
prettyname(out, "loadModuleExp", indent, getPos());
@@ -778,9 +871,55 @@ varEntry *accessModule(position pos, coenv &e, record *r, symbol id)
}
else {
// Create a varinit that evaluates to the module.
- // This is effectively the expression "loadModule(filename)".
+ // This is effectively the expression 'loadModule(filename,"")'.
+ callExp init(pos, new loadModuleExp(pos, imp),
+ new stringExp(pos, (string)id), new stringExp(pos, ""));
+
+ // The varEntry should have whereDefined()==0 as it is not defined inside
+ // the record r.
+ varEntry *v=makeVarEntryWhere(e, r, imp, 0, pos);
+ initializeVar(pos, e, v, &init);
+ return v;
+ }
+}
+
+// Creates a local variable to hold the import and translate the accessing of
+// the import, but doesn't add the import to the environment.
+varEntry *accessTemplatedModule(position pos, coenv &e, record *r, symbol id,
+ formals *args)
+{
+ stringstream s;
+ s << args->getSignature(e)->handle();
+ string sigHandle=s.str();
+
+ auto *computedArgs = new mem::vector<namedTyEntry*>();
+ mem::vector<tySymbolPair> *fields = args->getFields();
+ for (auto p = fields->begin(); p != fields->end(); ++p) {
+ ty* theType = p->ty;
+ symbol theName = p->sym;
+ if (theName == symbol::nullsym) {
+ em.error(theType->getPos());
+ em << "expected typename=";
+ em.sync();
+ return nullptr;
+ }
+ computedArgs->push_back(new namedTyEntry(
+ theType->getPos(), theName, theType->transAsTyEntry(e, r)
+ ));
+ }
+
+ record *imp=e.e.getTemplatedModule(id, (string) id, sigHandle, computedArgs);
+ if (!imp) {
+ em.error(pos);
+ em << "could not load module '" << id << "'";
+ em.sync();
+ return nullptr;
+ }
+ else {
+ // Create a varinit that evaluates to the module.
+ // This is effectively the expression 'loadModule(filename,index)'.
callExp init(pos, new loadModuleExp(pos, imp),
- new stringExp(pos, (string)id));
+ new stringExp(pos, (string) id), new stringExp(pos, sigHandle));
// The varEntry should have whereDefined()==0 as it is not defined inside
// the record r.
@@ -833,7 +972,9 @@ void idpair::createSymMap(AsymptoteLsp::SymbolContext* symContext)
}
// add (dest, source) to reference map.
- auto s = symContext->extRefs.fileIdPair.emplace(dest, (std::string) fullSrc.c_str());
+ auto s = symContext->extRefs.fileIdPair.emplace(
+ dest, (std::string) fullSrc.c_str()
+ );
auto it=std::get<0>(s);
auto success=std::get<1>(s);
if (not success)
@@ -898,6 +1039,126 @@ void accessdec::createSymMap(AsymptoteLsp::SymbolContext* symContext)
#endif
}
+void templateAccessDec::transAsField(coenv& e, record* r) {
+ if (!this->checkValidity()) return;
+
+ args->addOps(e, r);
+
+ varEntry *v=accessTemplatedModule(getPos(), e, r, this->src, args);
+ if (v)
+ addVar(e, r, v, dest);
+}
+
+void typeParam::prettyprint(ostream &out, Int indent) {
+ prettyindent(out, indent);
+ out << "typeParam (" << paramSym << ")\n";
+}
+
+bool typeParam::transAsParamMatcher(coenv &e, namedTyEntry* arg) {
+ if (arg->dest != paramSym) {
+ em.error(arg->pos);
+ em << "template argument name does not match module: passed "
+ << arg->dest
+ << ", expected "
+ << paramSym;
+ return false;
+ }
+ e.e.addType(paramSym, arg->ent);
+ // The code below would add e.g. operator== to the context, but potentially
+ // ignore overrides of operator==:
+ //
+ // types::ty *t = arg.ent->t;
+ // if (t->kind == types::ty_record) {
+ // record *r = dynamic_cast<record *>(t);
+ // if (r) {
+ // trans::addRecordOps(e.e.ve, r);
+ // }
+ // } else if (t->kind == types::ty_array) {
+ // array *a = dynamic_cast<array *>(t);
+ // if (a) {
+ // trans::addArrayOps(e.e.ve, a);
+ // }
+ // } else if (t->kind == types::ty_function) {
+ // function *f = dynamic_cast<function *>(t);
+ // if (f) {
+ // trans::addFunctionOps(e.e.ve, f);
+ // }
+ // }
+ return true;
+}
+
+void typeParamList::prettyprint(ostream &out, Int indent) {
+ for (auto p = params.begin(); p != params.end(); ++p) {
+ (*p)->prettyprint(out, indent);
+ }
+}
+
+void typeParamList::add(typeParam *tp) {
+ params.push_back(tp);
+}
+
+bool typeParamList::transAsParamMatcher(
+ coenv &e, mem::vector<namedTyEntry*> *args
+) {
+ if (args->size() != params.size()) {
+ position pos = getPos();
+ if (args->size() >= 1) {
+ pos = (*args)[0]->pos;
+ }
+ em.error(pos);
+ if (args->size() > params.size()) {
+ em << "too many types passed: got " << args->size() << ", expected "
+ << params.size();
+ } else {
+ em << "too few types passed: got " << args->size() << ", expected "
+ << params.size();
+ }
+ return false;
+ }
+ for (size_t i = 0; i < params.size(); ++i) {
+ bool succeeded = params[i]->transAsParamMatcher(e, (*args)[i]);
+ if (!succeeded) return false;
+ }
+ return true;
+}
+
+symbol intSymbol() {
+ const static symbol* intSymbol = new symbol(symbol::literalTrans("int"));
+ return *intSymbol;
+}
+
+symbol templatedSymbol() {
+ const static symbol* templatedSymbol =
+ new symbol(symbol::literalTrans("/templated"));
+ return *templatedSymbol;
+}
+
+bool receiveTypedefDec::transAsParamMatcher(
+ coenv& e, record *r, mem::vector<namedTyEntry*> *args
+) {
+ bool succeeded = params->transAsParamMatcher(e, args);
+
+ types::ty *intTy = e.e.lookupType(intSymbol());
+ assert(intTy);
+ e.e.addVar(templatedSymbol(),
+ makeVarEntryWhere(e, nullptr, intTy, r, getPos())
+ );
+
+ return succeeded;
+}
+
+void receiveTypedefDec::transAsField(coenv& e, record *r) {
+ em.error(getPos());
+ types::ty *intTy = e.e.lookupType(intSymbol());
+ assert(intTy);
+ if (e.e.lookupVarByType(templatedSymbol(), intTy)) {
+ em << "'typedef import(<types>)' must precede any other code";
+ } else {
+ em << "templated module access requires template parameters";
+ }
+ em.sync();
+}
+
void fromdec::prettyprint(ostream &out, Int indent)
{
@@ -961,7 +1222,12 @@ void fromaccessdec::prettyprint(ostream &out, Int indent)
fromdec::qualifier fromaccessdec::getQualifier(coenv &e, record *r)
{
- varEntry *v=accessModule(getPos(), e, r, id);
+ varEntry *v = 0;
+ if (templateArgs) {
+ v = accessTemplatedModule(getPos(), e, r, id, templateArgs);
+ } else {
+ v=accessModule(getPos(), e, r, id);
+ }
if (v) {
record *qt=dynamic_cast<record *>(v->getType());
if (!qt) {
@@ -1035,7 +1301,9 @@ void includedec::transAsField(coenv &e, record *r)
void includedec::createSymMap(AsymptoteLsp::SymbolContext* symContext)
{
#ifdef HAVE_LSP
- std::string fullname((std::string) settings::locateFile(filename, true).c_str());
+ std::string fullname(
+ (std::string) settings::locateFile(filename, true).c_str()
+ );
if (not AsymptoteLsp::isVirtualFile(fullname))
{
symContext->addEmptyExtRef(fullname);
@@ -1089,7 +1357,8 @@ void recorddec::transAsField(coenv &e, record *parent)
record *r = parent ? parent->newRecord(id, e.c.isStatic()) :
e.c.newRecord(id);
- addTypeWithPermission(e, parent, new trans::tyEntry(r,0,parent,getPos()), id);
+ addTypeWithPermission(e, parent, new trans::tyEntry(r,0,parent,getPos()),
+ id);
e.e.addRecordOps(r);
if (parent)
parent->e.addRecordOps(r);
diff --git a/Build/source/utils/asymptote/dec.h b/Build/source/utils/asymptote/dec.h
index 5a8f8cdd0ba..4700a29dd3a 100644
--- a/Build/source/utils/asymptote/dec.h
+++ b/Build/source/utils/asymptote/dec.h
@@ -65,7 +65,9 @@ public:
virtual operator string() const = 0;
#ifdef USEGC
- operator std::string() const { return mem::stdString(this->operator string()); }
+ operator std::string() const {
+ return mem::stdString(this->operator string());
+ }
#endif
};
@@ -102,7 +104,7 @@ public:
return depth;
}
- types::array *truetype(types::ty *base);
+ types::array *truetype(types::ty *base, bool tacit=false);
};
class arrayTy : public ty {
@@ -125,8 +127,8 @@ public:
operator string() const override;
};
-// Similar to varEntryExp, this helper class always translates to the same fixed
-// type.
+// Similar to varEntryExp, this helper class always translates to the same
+// fixed type.
class tyEntryTy : public ty {
trans::tyEntry *ent;
public:
@@ -197,6 +199,19 @@ public:
{ return false; }
};
+// Forward declaration.
+class formals;
+
+class namedTyEntry : public gc {
+public:
+ symbol dest;
+ trans::tyEntry *ent;
+ position pos;
+ namedTyEntry(position pos, symbol dest, trans::tyEntry *ent)
+ : dest(dest), ent(ent), pos(pos) {}
+};
+
+
class block : public runnable {
public:
mem::list<runnable *> stms;
@@ -224,10 +239,21 @@ public:
void transAsField(coenv &e, record *r) override;
+ bool transAsTemplatedField(
+ coenv &e, record *r, mem::vector<absyntax::namedTyEntry*>* args
+ );
+
void transAsRecordBody(coenv &e, record *r);
+ bool transAsTemplatedRecordBody(
+ coenv &e, record *r, mem::vector<absyntax::namedTyEntry*> *args
+ );
types::record *transAsFile(genv& ge, symbol id);
+ types::record *transAsTemplatedFile(
+ genv& ge, symbol id, mem::vector<absyntax::namedTyEntry*> *args
+ );
+
// If the block can be interpreted as a single vardec, return that vardec
// (otherwise 0).
vardec *asVardec();
@@ -333,12 +359,11 @@ public:
{ return id; }
void createSymMap(AsymptoteLsp::SymbolContext* symContext) override;
- void createSymMapWType(AsymptoteLsp::SymbolContext* symContext, absyntax::ty* base);
+ void createSymMapWType(
+ AsymptoteLsp::SymbolContext* symContext, absyntax::ty* base
+ );
};
-// Forward declaration.
-class formals;
-
class fundecidstart : public decidstart {
formals *params;
@@ -377,7 +402,9 @@ public:
decidstart *getStart() { return start; }
void createSymMap(AsymptoteLsp::SymbolContext* symContext) override;
- void createSymMapWType(AsymptoteLsp::SymbolContext* symContext, absyntax::ty* base);
+ void createSymMapWType(
+ AsymptoteLsp::SymbolContext* symContext, absyntax::ty* base
+ );
};
class decidlist : public absyn {
@@ -410,7 +437,9 @@ public:
}
void createSymMap(AsymptoteLsp::SymbolContext* symContext) override;
- void createSymMapWType(AsymptoteLsp::SymbolContext* symContext, absyntax::ty* base);
+ void createSymMapWType(
+ AsymptoteLsp::SymbolContext* symContext, absyntax::ty* base
+ );
};
class dec : public runnable {
@@ -543,6 +572,85 @@ public:
void createSymMap(AsymptoteLsp::SymbolContext* symContext) override;
};
+class badDec : public dec {
+ position errorPos;
+ string errorMessage;
+
+public:
+ badDec(position pos, position errorPos, string errorMessage)
+ : dec(pos), errorPos(errorPos), errorMessage(errorMessage) {}
+
+ void transAsField(coenv&, record*) override {
+ em.error(errorPos);
+ em << errorMessage;
+ }
+};
+
+// Accesses the file with specified types added to the type environment.
+class templateAccessDec : public dec {
+ symbol src; // The name of the module to access.
+ formals *args;
+ symbol dest; // What to call it in the local environment.
+ bool valid;
+ position expectedAsPos;
+
+public:
+ templateAccessDec(position pos, symbol src, formals* args, symbol as,
+ symbol dest, position asPos)
+ : dec(pos), src(src), args(args), dest(dest),
+ valid(as == symbol::trans("as")), expectedAsPos(asPos) {}
+
+ bool checkValidity() {
+ if (!valid) {
+ em.error(expectedAsPos);
+ em << "expected 'as'";
+ return false;
+ }
+ return true;
+ }
+
+ void transAsField(coenv& e, record* r) override;
+};
+
+class typeParam : public absyn {
+ const symbol paramSym;
+public:
+ typeParam(position pos, symbol paramSym)
+ : absyn(pos), paramSym(paramSym) {}
+
+ bool transAsParamMatcher(coenv &e, namedTyEntry *arg);
+
+ void prettyprint(ostream &out, Int indent);
+};
+
+class typeParamList : public absyn {
+ mem::vector<typeParam*> params;
+
+public:
+ typeParamList(position pos) : absyn(pos) {}
+
+ void add(typeParam *tp);
+
+ bool transAsParamMatcher(coenv &e, mem::vector<namedTyEntry*> *args);
+
+ void prettyprint(ostream &out, Int indent);
+};
+
+
+class receiveTypedefDec : public dec {
+ typeParamList* params;
+
+public:
+ receiveTypedefDec(position pos, typeParamList* params)
+ : dec(pos), params(params) {}
+
+ void transAsField(coenv& e, record *r) override;
+ bool transAsParamMatcher(
+ coenv& e, record *r, mem::vector<namedTyEntry*> *args
+ );
+};
+
+
// Abstract base class for
// from _ access _; (fromaccessdec)
// and
@@ -551,8 +659,8 @@ class fromdec : public dec {
protected:
struct qualifier {
// The varEntry holds the location and the type of the highest framed
- // structure that can be put on the stack. The record holds the actual type
- // of the qualifier.
+ // structure that can be put on the stack. The record holds the actual
+ // type of the qualifier.
// For example:
// struct A {
// struct B {
@@ -604,11 +712,13 @@ public:
// scope. It does not add the module as a variable in the local scope.
class fromaccessdec : public fromdec {
symbol id;
+ formals *templateArgs;
qualifier getQualifier(coenv &e, record *r) override;
public:
- fromaccessdec(position pos, symbol id, idpairlist *fields)
- : fromdec(pos, fields), id(id) {}
+ fromaccessdec(
+ position pos, symbol id, idpairlist *fields, formals *templateArgs = 0
+ ) : fromdec(pos, fields), id(id), templateArgs(templateArgs) {}
void prettyprint(ostream &out, Int indent) override;
diff --git a/Build/source/utils/asymptote/doc/CAD.pdf b/Build/source/utils/asymptote/doc/CAD.pdf
index 404c5f0e5b6..306c5309f15 100644
--- a/Build/source/utils/asymptote/doc/CAD.pdf
+++ b/Build/source/utils/asymptote/doc/CAD.pdf
Binary files differ
diff --git a/Build/source/utils/asymptote/doc/FAQ/asy-faq.info b/Build/source/utils/asymptote/doc/FAQ/asy-faq.info
index d2b3fcbec85..8a47fafe0cb 100644
--- a/Build/source/utils/asymptote/doc/FAQ/asy-faq.info
+++ b/Build/source/utils/asymptote/doc/FAQ/asy-faq.info
@@ -10,7 +10,7 @@ END-INFO-DIR-ENTRY
File: asy-faq.info, Node: Top, Next: Question 1.1, Up: (dir)
ASYMPTOTE FREQUENTLY ASKED QUESTIONS
- 2023-02-09
+ 2024-02-27
This is the list of Frequently Asked Questions about Asymptote (asy).
diff --git a/Build/source/utils/asymptote/doc/FAQ/install-sh b/Build/source/utils/asymptote/doc/FAQ/install-sh
index 7c56c9c0151..6781b987bdb 100755
--- a/Build/source/utils/asymptote/doc/FAQ/install-sh
+++ b/Build/source/utils/asymptote/doc/FAQ/install-sh
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2023-11-23.18; # UTC
+scriptversion=2009-04-28.21; # UTC
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -35,21 +35,25 @@ scriptversion=2023-11-23.18; # UTC
# FSF changes to this file are in the public domain.
#
# Calling this script install-sh is preferred over install.sh, to prevent
-# 'make' implicit rules from creating a file called install from it
+# `make' implicit rules from creating a file called install from it
# when there is no Makefile.
#
# This script is compatible with the BSD install script, but was written
# from scratch.
-tab=' '
nl='
'
-IFS=" $tab$nl"
+IFS=" "" $nl"
-# Set DOITPROG to "echo" to test this script.
+# set DOITPROG to echo to test this script
+# Don't use :- since 4.3BSD and earlier shells don't like it.
doit=${DOITPROG-}
-doit_exec=${doit:-exec}
+if test -z "$doit"; then
+ doit_exec=exec
+else
+ doit_exec=$doit
+fi
# Put in absolute file names if you don't have them in your path;
# or use environment vars.
@@ -64,16 +68,22 @@ mvprog=${MVPROG-mv}
rmprog=${RMPROG-rm}
stripprog=${STRIPPROG-strip}
+posix_glob='?'
+initialize_posix_glob='
+ test "$posix_glob" != "?" || {
+ if (set -f) 2>/dev/null; then
+ posix_glob=
+ else
+ posix_glob=:
+ fi
+ }
+'
+
posix_mkdir=
# Desired mode of installed file.
mode=0755
-# Create dirs (including intermediate dirs) using mode 755.
-# This is like GNU 'install' as of coreutils 8.32 (2020).
-mkdir_umask=22
-
-backupsuffix=
chgrpcmd=
chmodcmd=$chmodprog
chowncmd=
@@ -87,7 +97,7 @@ dir_arg=
dst_arg=
copy_on_change=false
-is_target_a_directory=possibly
+no_target_directory=
usage="\
Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
@@ -104,29 +114,19 @@ Options:
--version display version info and exit.
-c (ignored)
- -C install only if different (preserve data modification time)
+ -C install only if different (preserve the last data modification time)
-d create directories instead of installing files.
-g GROUP $chgrpprog installed files to GROUP.
-m MODE $chmodprog installed files to MODE.
-o USER $chownprog installed files to USER.
- -p pass -p to $cpprog.
-s $stripprog installed files.
- -S SUFFIX attempt to back up existing files, with suffix SUFFIX.
-t DIRECTORY install into DIRECTORY.
-T report an error if DSTFILE is a directory.
Environment variables override the default commands:
CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
RMPROG STRIPPROG
-
-By default, rm is invoked with -f; when overridden with RMPROG,
-it's up to you to specify -f if you want it.
-
-If -S is not specified, no backups are attempted.
-
-Report bugs to <bug-automake@gnu.org>.
-GNU Automake home page: <https://www.gnu.org/software/automake/>.
-General help using GNU software: <https://www.gnu.org/gethelp/>."
+"
while test $# -ne 0; do
case $1 in
@@ -137,62 +137,42 @@ while test $# -ne 0; do
-d) dir_arg=true;;
-g) chgrpcmd="$chgrpprog $2"
- shift;;
+ shift;;
--help) echo "$usage"; exit $?;;
-m) mode=$2
- case $mode in
- *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*)
- echo "$0: invalid mode: $mode" >&2
- exit 1;;
- esac
- shift;;
+ case $mode in
+ *' '* | *' '* | *'
+'* | *'*'* | *'?'* | *'['*)
+ echo "$0: invalid mode: $mode" >&2
+ exit 1;;
+ esac
+ shift;;
-o) chowncmd="$chownprog $2"
- shift;;
-
- -p) cpprog="$cpprog -p";;
+ shift;;
-s) stripcmd=$stripprog;;
- -S) backupsuffix="$2"
- shift;;
-
- -t)
- is_target_a_directory=always
- dst_arg=$2
- # Protect names problematic for 'test' and other utilities.
- case $dst_arg in
- -* | [=\(\)!]) dst_arg=./$dst_arg;;
- esac
- shift;;
+ -t) dst_arg=$2
+ shift;;
- -T) is_target_a_directory=never;;
+ -T) no_target_directory=true;;
--version) echo "$0 $scriptversion"; exit $?;;
- --) shift
- break;;
+ --) shift
+ break;;
- -*) echo "$0: invalid option: $1" >&2
- exit 1;;
+ -*) echo "$0: invalid option: $1" >&2
+ exit 1;;
*) break;;
esac
shift
done
-# We allow the use of options -d and -T together, by making -d
-# take the precedence; this is for compatibility with GNU install.
-
-if test -n "$dir_arg"; then
- if test -n "$dst_arg"; then
- echo "$0: target directory not allowed when installing a directory." >&2
- exit 1
- fi
-fi
-
if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
# When -d is used, all remaining arguments are directories to create.
# When -t is used, the destination is already specified.
@@ -206,10 +186,6 @@ if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
fi
shift # arg
dst_arg=$arg
- # Protect names problematic for 'test' and other utilities.
- case $dst_arg in
- -* | [=\(\)!]) dst_arg=./$dst_arg;;
- esac
done
fi
@@ -218,26 +194,13 @@ if test $# -eq 0; then
echo "$0: no input file specified." >&2
exit 1
fi
- # It's OK to call 'install-sh -d' without argument.
+ # It's OK to call `install-sh -d' without argument.
# This can happen when creating conditional directories.
exit 0
fi
if test -z "$dir_arg"; then
- if test $# -gt 1 || test "$is_target_a_directory" = always; then
- if test ! -d "$dst_arg"; then
- echo "$0: $dst_arg: Is not a directory." >&2
- exit 1
- fi
- fi
-fi
-
-if test -z "$dir_arg"; then
- do_exit='(exit $ret); exit $ret'
- trap "ret=129; $do_exit" 1
- trap "ret=130; $do_exit" 2
- trap "ret=141; $do_exit" 13
- trap "ret=143; $do_exit" 15
+ trap '(exit $?); exit' 1 2 13 15
# Set umask so as not to create temps with too-generous modes.
# However, 'strip' requires both read and write access to temps.
@@ -248,16 +211,16 @@ if test -z "$dir_arg"; then
*[0-7])
if test -z "$stripcmd"; then
- u_plus_rw=
+ u_plus_rw=
else
- u_plus_rw='% 200'
+ u_plus_rw='% 200'
fi
cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
*)
if test -z "$stripcmd"; then
- u_plus_rw=
+ u_plus_rw=
else
- u_plus_rw=,u+rw
+ u_plus_rw=,u+rw
fi
cp_umask=$mode$u_plus_rw;;
esac
@@ -265,9 +228,9 @@ fi
for src
do
- # Protect names problematic for 'test' and other utilities.
+ # Protect names starting with `-'.
case $src in
- -* | [=\(\)!]) src=./$src;;
+ -*) src=./$src;;
esac
if test -n "$dir_arg"; then
@@ -275,10 +238,6 @@ do
dstdir=$dst
test -d "$dstdir"
dstdir_status=$?
- # Don't chown directories that already exist.
- if test $dstdir_status = 0; then
- chowncmd=""
- fi
else
# Waiting for this to be detected by the "$cpprog $src $dsttmp" command
@@ -293,150 +252,185 @@ do
echo "$0: no destination specified." >&2
exit 1
fi
+
dst=$dst_arg
+ # Protect names starting with `-'.
+ case $dst in
+ -*) dst=./$dst;;
+ esac
- # If destination is a directory, append the input filename.
+ # If destination is a directory, append the input filename; won't work
+ # if double slashes aren't ignored.
if test -d "$dst"; then
- if test "$is_target_a_directory" = never; then
- echo "$0: $dst_arg: Is a directory" >&2
- exit 1
+ if test -n "$no_target_directory"; then
+ echo "$0: $dst_arg: Is a directory" >&2
+ exit 1
fi
dstdir=$dst
- dstbase=`basename "$src"`
- case $dst in
- */) dst=$dst$dstbase;;
- *) dst=$dst/$dstbase;;
- esac
+ dst=$dstdir/`basename "$src"`
dstdir_status=0
else
- dstdir=`dirname "$dst"`
+ # Prefer dirname, but fall back on a substitute if dirname fails.
+ dstdir=`
+ (dirname "$dst") 2>/dev/null ||
+ expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$dst" : 'X\(//\)[^/]' \| \
+ X"$dst" : 'X\(//\)$' \| \
+ X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
+ echo X"$dst" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'
+ `
+
test -d "$dstdir"
dstdir_status=$?
fi
fi
- case $dstdir in
- */) dstdirslash=$dstdir;;
- *) dstdirslash=$dstdir/;;
- esac
-
obsolete_mkdir_used=false
if test $dstdir_status != 0; then
case $posix_mkdir in
'')
- # With -d, create the new directory with the user-specified mode.
- # Otherwise, rely on $mkdir_umask.
- if test -n "$dir_arg"; then
- mkdir_mode=-m$mode
- else
- mkdir_mode=
- fi
-
- posix_mkdir=false
- # The $RANDOM variable is not portable (e.g., dash). Use it
- # here however when possible just to lower collision chance.
- tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
-
- trap '
- ret=$?
- rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null
- exit $ret
- ' 0
-
- # Because "mkdir -p" follows existing symlinks and we likely work
- # directly in world-writeable /tmp, make sure that the '$tmpdir'
- # directory is successfully created first before we actually test
- # 'mkdir -p'.
- if (umask $mkdir_umask &&
- $mkdirprog $mkdir_mode "$tmpdir" &&
- exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
- then
- if test -z "$dir_arg" || {
- # Check for POSIX incompatibilities with -m.
- # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
- # other-writable bit of parent directory when it shouldn't.
- # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
- test_tmpdir="$tmpdir/a"
- ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
- case $ls_ld_tmpdir in
- d????-?r-*) different_mode=700;;
- d????-?--*) different_mode=755;;
- *) false;;
- esac &&
- $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
- ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
- test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
- }
- }
- then posix_mkdir=:
- fi
- rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
+ # Create intermediate dirs using mode 755 as modified by the umask.
+ # This is like FreeBSD 'install' as of 1997-10-28.
+ umask=`umask`
+ case $stripcmd.$umask in
+ # Optimize common cases.
+ *[2367][2367]) mkdir_umask=$umask;;
+ .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
+
+ *[0-7])
+ mkdir_umask=`expr $umask + 22 \
+ - $umask % 100 % 40 + $umask % 20 \
+ - $umask % 10 % 4 + $umask % 2
+ `;;
+ *) mkdir_umask=$umask,go-w;;
+ esac
+
+ # With -d, create the new directory with the user-specified mode.
+ # Otherwise, rely on $mkdir_umask.
+ if test -n "$dir_arg"; then
+ mkdir_mode=-m$mode
else
- # Remove any dirs left behind by ancient mkdir implementations.
- rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
+ mkdir_mode=
fi
- trap '' 0;;
+
+ posix_mkdir=false
+ case $umask in
+ *[123567][0-7][0-7])
+ # POSIX mkdir -p sets u+wx bits regardless of umask, which
+ # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
+ ;;
+ *)
+ tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+ trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
+
+ if (umask $mkdir_umask &&
+ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
+ then
+ if test -z "$dir_arg" || {
+ # Check for POSIX incompatibilities with -m.
+ # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+ # other-writeable bit of parent directory when it shouldn't.
+ # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+ ls_ld_tmpdir=`ls -ld "$tmpdir"`
+ case $ls_ld_tmpdir in
+ d????-?r-*) different_mode=700;;
+ d????-?--*) different_mode=755;;
+ *) false;;
+ esac &&
+ $mkdirprog -m$different_mode -p -- "$tmpdir" && {
+ ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+ test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+ }
+ }
+ then posix_mkdir=:
+ fi
+ rmdir "$tmpdir/d" "$tmpdir"
+ else
+ # Remove any dirs left behind by ancient mkdir implementations.
+ rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+ fi
+ trap '' 0;;
+ esac;;
esac
if
$posix_mkdir && (
- umask $mkdir_umask &&
- $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+ umask $mkdir_umask &&
+ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
)
then :
else
- # mkdir does not conform to POSIX,
+ # The umask is ridiculous, or mkdir does not conform to POSIX,
# or it failed possibly due to a race condition. Create the
# directory the slow way, step by step, checking for races as we go.
case $dstdir in
- /*) prefix='/';;
- [-=\(\)!]*) prefix='./';;
- *) prefix='';;
+ /*) prefix='/';;
+ -*) prefix='./';;
+ *) prefix='';;
esac
+ eval "$initialize_posix_glob"
+
oIFS=$IFS
IFS=/
- set -f
+ $posix_glob set -f
set fnord $dstdir
shift
- set +f
+ $posix_glob set +f
IFS=$oIFS
prefixes=
for d
do
- test X"$d" = X && continue
-
- prefix=$prefix$d
- if test -d "$prefix"; then
- prefixes=
- else
- if $posix_mkdir; then
- (umask $mkdir_umask &&
- $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
- # Don't fail if two instances are running concurrently.
- test -d "$prefix" || exit 1
- else
- case $prefix in
- *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
- *) qprefix=$prefix;;
- esac
- prefixes="$prefixes '$qprefix'"
- fi
- fi
- prefix=$prefix/
+ test -z "$d" && continue
+
+ prefix=$prefix$d
+ if test -d "$prefix"; then
+ prefixes=
+ else
+ if $posix_mkdir; then
+ (umask=$mkdir_umask &&
+ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+ # Don't fail if two instances are running concurrently.
+ test -d "$prefix" || exit 1
+ else
+ case $prefix in
+ *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+ *) qprefix=$prefix;;
+ esac
+ prefixes="$prefixes '$qprefix'"
+ fi
+ fi
+ prefix=$prefix/
done
if test -n "$prefixes"; then
- # Don't fail if two instances are running concurrently.
- (umask $mkdir_umask &&
- eval "\$doit_exec \$mkdirprog $prefixes") ||
- test -d "$dstdir" || exit 1
- obsolete_mkdir_used=true
+ # Don't fail if two instances are running concurrently.
+ (umask $mkdir_umask &&
+ eval "\$doit_exec \$mkdirprog $prefixes") ||
+ test -d "$dstdir" || exit 1
+ obsolete_mkdir_used=true
fi
fi
fi
@@ -449,25 +443,14 @@ do
else
# Make a couple of temp file names in the proper directory.
- dsttmp=${dstdirslash}_inst.$$_
- rmtmp=${dstdirslash}_rm.$$_
+ dsttmp=$dstdir/_inst.$$_
+ rmtmp=$dstdir/_rm.$$_
# Trap to clean up those temp files at exit.
trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
# Copy the file name to the temp name.
- (umask $cp_umask &&
- { test -z "$stripcmd" || {
- # Create $dsttmp read-write so that cp doesn't create it read-only,
- # which would cause strip to fail.
- if test -z "$doit"; then
- : >"$dsttmp" # No need to fork-exec 'touch'.
- else
- $doit touch "$dsttmp"
- fi
- }
- } &&
- $doit_exec $cpprog "$src" "$dsttmp") &&
+ (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
# and set any options; do chmod last to preserve setuid bits.
#
@@ -482,24 +465,20 @@ do
# If -C, don't bother to copy if it wouldn't change the file.
if $copy_on_change &&
- old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
- new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
- set -f &&
+ old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
+ new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
+
+ eval "$initialize_posix_glob" &&
+ $posix_glob set -f &&
set X $old && old=:$2:$4:$5:$6 &&
set X $new && new=:$2:$4:$5:$6 &&
- set +f &&
+ $posix_glob set +f &&
+
test "$old" = "$new" &&
$cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
then
rm -f "$dsttmp"
else
- # If $backupsuffix is set, and the file being installed
- # already exists, attempt a backup. Don't worry if it fails,
- # e.g., if mv doesn't support -f.
- if test -n "$backupsuffix" && test -f "$dst"; then
- $doit $mvcmd -f "$dst" "$dst$backupsuffix" 2>/dev/null
- fi
-
# Rename the file to the real destination.
$doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
@@ -507,24 +486,24 @@ do
# to itself, or perhaps because mv is so ancient that it does not
# support -f.
{
- # Now remove or move aside any old file at destination location.
- # We try this two ways since rm can't unlink itself on some
- # systems and the destination file might be busy for other
- # reasons. In this case, the final cleanup might fail but the new
- # file should still install successfully.
- {
- test ! -f "$dst" ||
- $doit $rmcmd "$dst" 2>/dev/null ||
- { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
- { $doit $rmcmd "$rmtmp" 2>/dev/null; :; }
- } ||
- { echo "$0: cannot unlink or rename $dst" >&2
- (exit 1); exit 1
- }
- } &&
-
- # Now rename the file to the real destination.
- $doit $mvcmd "$dsttmp" "$dst"
+ # Now remove or move aside any old file at destination location.
+ # We try this two ways since rm can't unlink itself on some
+ # systems and the destination file might be busy for other
+ # reasons. In this case, the final cleanup might fail but the new
+ # file should still install successfully.
+ {
+ test ! -f "$dst" ||
+ $doit $rmcmd -f "$dst" 2>/dev/null ||
+ { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+ { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+ } ||
+ { echo "$0: cannot unlink or rename $dst" >&2
+ (exit 1); exit 1
+ }
+ } &&
+
+ # Now rename the file to the real destination.
+ $doit $mvcmd "$dsttmp" "$dst"
}
fi || exit 1
@@ -533,9 +512,9 @@ do
done
# Local variables:
-# eval: (add-hook 'before-save-hook 'time-stamp)
+# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC0"
+# time-stamp-time-zone: "UTC"
# time-stamp-end: "; # UTC"
# End:
diff --git a/Build/source/utils/asymptote/doc/TeXShopAndAsymptote.pdf b/Build/source/utils/asymptote/doc/TeXShopAndAsymptote.pdf
index 9926852eec1..a43c2db07c5 100644
--- a/Build/source/utils/asymptote/doc/TeXShopAndAsymptote.pdf
+++ b/Build/source/utils/asymptote/doc/TeXShopAndAsymptote.pdf
Binary files differ
diff --git a/Build/source/utils/asymptote/doc/asy-latex.dtx b/Build/source/utils/asymptote/doc/asy-latex.dtx
index 211ad202b17..febf3f4c47e 100644
--- a/Build/source/utils/asymptote/doc/asy-latex.dtx
+++ b/Build/source/utils/asymptote/doc/asy-latex.dtx
@@ -38,7 +38,7 @@ Licence: GPL2+
%</driver>
%<pkg>\ProvidesPackage{asymptote}
%<*pkg>
- [2021/12/29 v1.37 Asymptote style file for LaTeX]
+ [2024/02/26 v1.38 Asymptote style file for LaTeX]
%</pkg>
%
%<*driver>
@@ -165,7 +165,7 @@ Licence: GPL2+
% \end{macrocode}
%
% \begin{macrocode}
-\InputIfFileExists{\jobname.pre}{}{}
+\InputIfFileExists{\jobname.pre}{}{\typeout{No file \jobname.pre.}}
% \end{macrocode}
%
% \subsection{Allocations}
diff --git a/Build/source/utils/asymptote/doc/asy-latex.pdf b/Build/source/utils/asymptote/doc/asy-latex.pdf
index 554016edc6b..6a6834ba30a 100644
--- a/Build/source/utils/asymptote/doc/asy-latex.pdf
+++ b/Build/source/utils/asymptote/doc/asy-latex.pdf
Binary files differ
diff --git a/Build/source/utils/asymptote/doc/asy.1 b/Build/source/utils/asymptote/doc/asy.1
index 4738bebd4e1..41a4ece5f6a 100644
--- a/Build/source/utils/asymptote/doc/asy.1
+++ b/Build/source/utils/asymptote/doc/asy.1
@@ -242,7 +242,7 @@ PostScript offset [(0,0)].
Convert each output file to specified format.
.TP
.B \-o,\-outname name
-Alternative output directory/filename.
+Alternative output directory/file prefix.
.TP
.B \-outpipe n
Output pipe [-1].
@@ -343,6 +343,9 @@ Use two-sided 3D lighting model for rendering [true].
.B \-u,\-user str
General purpose user string.
.TP
+.B \-v3d
+Embed 3D V3D graphics in PDF output [false].
+.TP
.B \-v,\-verbose
Increase verbosity level (can specify multiple times) 0.
.TP
@@ -368,7 +371,7 @@ Use webgl2 if available [false].
Show where listed variables are declared [false].
.TP
.B \-wsl
-Run asy under the Windows Subsystem for Linux. [false].
+Run asy under the Windows Subsystem for Linux [false].
.TP
.B \-xasy
Interactive mode for xasy [false].
diff --git a/Build/source/utils/asymptote/doc/asyRefCard.pdf b/Build/source/utils/asymptote/doc/asyRefCard.pdf
index bdc97baa740..de22ab3176b 100644
--- a/Build/source/utils/asymptote/doc/asyRefCard.pdf
+++ b/Build/source/utils/asymptote/doc/asyRefCard.pdf
Binary files differ
diff --git a/Build/source/utils/asymptote/doc/asymptote.pdf b/Build/source/utils/asymptote/doc/asymptote.pdf
index b38e93f9c76..79ccc9346e3 100644
--- a/Build/source/utils/asymptote/doc/asymptote.pdf
+++ b/Build/source/utils/asymptote/doc/asymptote.pdf
Binary files differ
diff --git a/Build/source/utils/asymptote/doc/asymptote.sty b/Build/source/utils/asymptote/doc/asymptote.sty
index 2deb265a80c..a3b9dc79f01 100644
--- a/Build/source/utils/asymptote/doc/asymptote.sty
+++ b/Build/source/utils/asymptote/doc/asymptote.sty
@@ -17,9 +17,9 @@
%% Licence: GPL2+
%%
\ProvidesPackage{asymptote}
- [2021/12/29 v1.37 Asymptote style file for LaTeX]
+ [2024/02/26 v1.38 Asymptote style file for LaTeX]
\def\Asymptote{{\tt Asymptote}}
-\InputIfFileExists{\jobname.pre}{}{}
+\InputIfFileExists{\jobname.pre}{}{\typeout{No file \jobname.pre.}}
\newbox\ASYbox
\newdimen\ASYdimen
\newcounter{asy}
diff --git a/Build/source/utils/asymptote/doc/asymptote.texi b/Build/source/utils/asymptote/doc/asymptote.texi
index 7e159345478..3f16bb9d6e5 100644
--- a/Build/source/utils/asymptote/doc/asymptote.texi
+++ b/Build/source/utils/asymptote/doc/asymptote.texi
@@ -11,7 +11,7 @@ This file documents @code{Asymptote}, version @value{VERSION}.
@url{https://asymptote.sourceforge.io}
-Copyright @copyright{} 2004-23 Andy Hammerlindl, John Bowman, and Tom Prince.
+Copyright @copyright{} 2004-24 Andy Hammerlindl, John Bowman, and Tom Prince.
@quotation
Permission is granted to copy, distribute and/or modify this document
@@ -133,6 +133,10 @@ Arrays
* Slices:: Python-style array slices
+Import
+
+* Templated imports::
+
Base modules
* plain:: Default @code{Asymptote} base file
@@ -2908,10 +2912,9 @@ the routine
@verbatim
pen rgb(string s);
@end verbatim
-@noindent
-A pen can be converted to a hexadecimal string with
+@item A pen can be converted to a hexadecimal string with
@cindex @code{hex}
-@item string hex(pen p);
+@code{string hex(pen p);}
Various shades and mixtures of the grayscale primary colors
@code{black} and @code{white}, @acronym{RGB} primary colors
@@ -3549,8 +3552,7 @@ The @code{options}, @code{script}, and @code{projection} parameters
are only relevant for 3D pictures. If @code{defaultfilename} is an
empty string, the prefix @code{outprefix()} will be used.
-A @code{shipout()} command is added implicitly at file exit if no
-previous @code{shipout} commands have been executed.
+A @code{shipout()} command is added implicitly at file exit.
@cindex @code{orientation}
@cindex @code{Portrait}
@cindex @code{Landscape}
@@ -5286,7 +5288,7 @@ The @code{copy} function listed below provides a deep copy of an array.
Every array @code{A} of type @code{T[]} has the virtual members
@itemize
@item @code{int length},
-@item @code{int cyclic},
+@item @code{bool cyclic},
@item @code{int[] keys},
@item @code{T push(T x)},
@item @code{void append(T[] a)},
@@ -5402,9 +5404,9 @@ element of the array @code{a}. This is equivalent to
@cindex @code{map}
@item T2[] map(T2 f(T1), T1[] a)
-constructed by calling @code{mapArray("T1","T2")}, returns the array
-obtained by applying the function @code{f} to each element of the
-array @code{a};
+constructed by running @code{from mapArray(Src=T1, Dst=T2) access map;},
+returns the array obtained by applying the function @code{f} to each
+element of the array @code{a};
@cindex @code{reverse}
@item int[] reverse(int n)
@@ -6122,9 +6124,6 @@ code s=quote {
eval(s,true); // Outputs 1
@end verbatim
-One application of @code{eval} is the creation of parametrized Asymptote
-code, such as a map from one type to another (@pxref{map}).
-
@cindex @code{include}
To include the contents of an existing file @code{graph} verbatim (as if the
contents of the file were inserted at that point), use one of the forms:
@@ -6144,6 +6143,61 @@ void list(string s, bool imports=false);
Imported global functions and variables are also listed if
@code{imports} is @code{true}.
+@menu
+* Templated imports::
+@end menu
+
+@node Templated imports
+@subsection Templated imports
+@cindex template
+
+@strong{Warning:} This feature is experimental: it has known issues and its behavior may change in the future.
+
+In Asymptote, it is possible to create modules that must have one or more
+types specified when they are imported. The first executable line of any such
+module must be of the form @code{typedef import(<types>)}, where
+@code{<types>} is a list of required type parameters. For instance,
+@verbatim
+typedef import(T, S, Number);
+@end verbatim
+@noindent
+could be the first line of a module that requires three type parameters. The
+remaining code in the module can then use @code{T}, @code{S}, and @code{Number}
+as types.
+
+To import such a module, one must specify the types to be used. For instance,
+if the module above were named @code{templatedModule}, it could be accessed
+for types @code{string}, @code{int[]}, and @code{real} with the import
+command
+@verbatim
+access templatedModule(T=string, S=int[], Number=real)
+ as templatedModule_string_int_real;
+@end verbatim
+@noindent
+Note that this is actually an @emph{access} command rather than an
+@emph{import} command, so the names of types, functions, etc. would have to be
+stated as e.g. @code{templatedModule_string_int_real.Wrapper_Number} rather than
+just @code{Wrapper_Number} (where @code{Wrapper_Number} is a type defined in
+@code{templatedModule.asy}).
+
+Alternatively, the module could be imported via a command like
+@verbatim
+from templatedModule(T=string, S=int[], Number=real) access
+ Wrapper_Number as Wrapper_real,
+ operator ==;
+@end verbatim
+@noindent
+This command would automatically rename @code{Wrapper_Number} to
+@code{Wrapper_real} and would also allow the use of any @code{operator ==}
+overloads defined in the module.
+
+For more information, see the examples in
+@url{https://github.com/vectorgraphics/asymptote/tree/647b6c5732ec94a48f0f0b2446f02c86888fe7e7/tests/template}.
+
+Issues: Certain standard features of almost any type (such as
+@code{==}, @code{new}, and the ability to call static methods on the type) may
+only be available for type arguments that are builtin or defined in the @code{plain} module.
+
@node Static, , Import, Programming
@section Static
@cindex @code{static}
@@ -6331,9 +6385,7 @@ To store the figures in a separate directory named @code{asy}, one can define
@verbatim
\def\asydir{asy}
@end verbatim
-in @code{latexusage.tex} and put the contents of
-@url{https://raw.githubusercontent.com/vectorgraphics/asymptote/HEAD/doc/latexmkrc_asydir}
-in a file @code{latexmkrc} in the same directory.
+in @code{latexusage.tex}.
@noindent
External @code{Asymptote} code can be included with
@cindex @code{asyinclude}
@@ -6911,6 +6963,7 @@ The points are connected using the interpolation specified by @code{join}:
@item @code{operator ..} (piecewise Bezier cubic spline interpolation;
the abbreviation @code{Spline} is also accepted);
+@cindex @code{linear}
@cindex @code{Hermite}
@cindex @code{notaknot}
@cindex @code{natural}
@@ -6918,6 +6971,7 @@ the abbreviation @code{Spline} is also accepted);
@cindex @code{clamped}
@cindex @code{monotonic}
@cindex @code{Hermite(splinetype splinetype}
+@item @code{linear} (linear interpolation),
@item @code{Hermite} (standard cubic spline interpolation using boundary
condition @code{notaknot}, @code{natural}, @code{periodic},
@code{clamped(real slopea, real slopeb)}), or @code{monotonic}.
@@ -8264,12 +8318,24 @@ The @acronym{PRC} specification is available from
@url{https://web.archive.org/web/20081204104459/http://livedocs.adobe.com/acrobat_sdk/9/Acrobat9_HTMLHelp/API_References/PRCReference/PRC_Format_Specification/}
@cindex @code{v3d}
-@item Output a @code{V3D} portable compressed binary file for viewing with an
-external viewer or conversion to an alternate 3D format with the Python
-@code{pyv3d} library. The @code{V3D} specification and the
+@item Output a @acronym{V3D} portable compressed vector graphics file
+using @code{settings.outformat="v3d"}, which can be viewed
+with an external viewer or converted to an alternate 3D format
+using the Python @code{pyv3d} library. @acronym{V3D} content can be automatically embedded within
+a @acronym{PDF} file using the options @code{settings.outformat="pdf"} and
+@code{settings.v3d=true}. Alternatively, a V3D file @code{file.v3d} may be manually embedded
+within a @acronym{PDF} file using the @code{media9} @code{LaTeX} package:
+@verbatim
+\includemedia[noplaybutton,width=100pt,height=200pt]{}{file.v3d}%
+@end verbatim
+An online @code{Javascript}-based V3D-aware @code{PDF} viewer is
+available at
+@url{https://github.com/vectorgraphics/pdfv3dReader}.
+
+The @acronym{V3D} specification and the
@code{pyv3d} library are available at
@url{https://github.com/vectorgraphics/v3d}.
-A @code{V3D} file @code{file.v3d} may be imported and viewed by
+A @acronym{V3D} file @code{file.v3d} may be imported and viewed by
@code{Asymptote} either by specifying @code{file.v3d} on the command line
@verbatim
asy -V file.v3d
@@ -9030,7 +9096,7 @@ picture vectorfield(path3 vector(pair v), triple f(pair z), pair a, pair b,
arrowbar3 arrow=Arrow3, margin3 margin=PenMargin3)
@end verbatim
as illustrated in the examples @code{@uref{https://asymptote.sourceforge.io/gallery/3Dgraphs/vectorfield3.html,,vectorfield3}@uref{https://asymptote.sourceforge.io/gallery/3Dgraphs/vectorfield3.asy,,.asy}} and
-@code{@uref{https://asymptote.sourceforge.io/gallery/3Dgraphs/vectorfieldsphere.html,,vectorfieldsphere}@uref{https://asymptote.sourceforge.io/gallery/3Dgraphs/vectorfieldsphere.asy,,.asy}}.
+@code{@uref{https://asymptote.sourceforge.io/gallery/3Dwebgl/vectorfieldsphere.html,,vectorfieldsphere}@uref{https://asymptote.sourceforge.io/gallery/3Dwebgl/vectorfieldsphere.asy,,.asy}}.
@node grid3, solids, graph3, Base modules
@section @code{grid3}
@@ -10307,7 +10373,7 @@ developed the @code{Asymptote Web Application} hosted at
@c LocalWords: differentiable vectorization vectorized asydir normals quartic
@c LocalWords: wavepacket kerned parametrized specular hyperboloid Bourke's
@c LocalWords: Michail 0pt 1filll 's 3D labelpath3 2D graph3 0pt 3D
-@c LocalWords: grid3 contour3 x86_64 psv a4 freeglut 'load '
+@c LocalWords: grid3 contour3 x86_64 psv a4 freeglut 'load ' 0pt 's
@c LocalWords: 'asy 'lasy 'auto 5bp 1cm sqrtx01 4g extenda extendb
@c LocalWords: bb llx 2S 100pt 3t bezier2 bool3 x0 angle1 angle2 z1
@c LocalWords: z2 before' struct X11 x11colors type1cm 12pt OT1 5mm
@@ -10372,4 +10438,70 @@ developed the @code{Asymptote Web Application} hosted at
@c LocalWords: renderers 2E ESC AsyGL 48kB 2n 100d 5z 5y 5unit 10cm
@c LocalWords: unicode 144x144 Pedram Emami 204e 10x Ai Ai Ai Ai Ai
@c LocalWords: Ai Ai Ai 5a 5E 5cm 2N 2E devicepixelratio 48kB 2n 5z
-@c LocalWords: 100d 5y 5unit 144x144
+@c LocalWords: 100d 5y 5unit 144x144 2004-23 2004-24 top-level 3D
+@c LocalWords: 1filll Command-line Command-Line command-line 2D 15
+@c LocalWords: high-order User-defined Python-style Templated V3D
+@c LocalWords: coordinate-based high-quality high-level de-facto 56
+@c LocalWords: command-driven graphical-user-interface full-fledged
+@c LocalWords: script-generated script-based fixed-sized ASYMPTOTE_
+@c LocalWords: user-written Debian-based self-extracting disable-gc
+@c LocalWords: google-chrome installation-dependent microsoft-edge
+@c LocalWords: ASYMPTOTE_PAPERTYPE Right-click ASYMPTOTE_DIR C-c 72
+@c LocalWords: ASYMPTOTE_HOME asymptote-x DCMAKE_INSTALL_PREFIX M-x
+@c LocalWords: DCMAKE_C_FLAGS texinfo-tex system-wide asy-mode C-h
+@c LocalWords: lasy-mode add-to-list 'load-path 'asy-mode asy-kate
+@c LocalWords: 'lasy-mode 'asy-insinuate-latex 'auto-mode-alist 100
+@c LocalWords: two-mode-mode latex-mode space-separated apt-get 5bp
+@c LocalWords: ASYMPTOTE_SITEDIR build-dep Vector_Graphics_Language
+@c LocalWords: 1cm double-quoted 06 left-hand right-hand even-odd
+@c LocalWords: two-dimensional three-dimensional 4g fixed-size a--b
+@c LocalWords: bottom-left 45 10 picture-transformed plain_Label 2S
+@c LocalWords: comma-separated boundary-drawing plain_boxes 100pt
+@c LocalWords: z_0 c_0 z_1 c_1 1-t 3t third-order m_5 first-order
+@c LocalWords: m_0 m_1 m_2 m_3 m_4 second-order 14 75 1986 x-I 360
+@c LocalWords: inflection-free Java-style user-defined built-in a-c
+@c LocalWords: highest-precision floating-point element-by-element
+@c LocalWords: a--b--c--cycle b-c counterclockwise-oriented 377 01
+@c LocalWords: C-style 1970 02 2007 24 60 non-zero z2-c z1-c b-a 68
+@c LocalWords: counter-clockwise t-floor 137 P--Q p--q cubic-spline
+@c LocalWords: two-element non-default 255 6-character 140 180 375
+@c LocalWords: plain_pens z--z 12pt 2018 UTF-8 CJKfamily right-top
+@c LocalWords: foreground--background left-bottom 5mm 90 25 25cm 50
+@c LocalWords: end-of-file one-dimensional 64-bit 32-bit C-like i-1
+@c LocalWords: end-of-line asy_history_ path-joining 3x 5x 3y 2x 2y
+@c LocalWords: 602e-19 3sin 10cm 204e-19 non-function 17 L-values
+@c LocalWords: so-called 10x 34 43 keyword-only 77 42 Keyword-only
+@c LocalWords: 21 six-element zero-length n-k Ai_deriv Bi_deriv n-1
+@c LocalWords: zero_Ai zero_Bi zero_Ai_deriv zero_Bi_deriv i_scaled
+@c LocalWords: k_scaled zero_J Newton-Raphson real-valued f_i T2 T1
+@c LocalWords: out-of-bounds higher-indexed Dst n-2 realschur schur
+@c LocalWords: quasitriangular 19 33 white-space Python-like 12 103
+@c LocalWords: comma-separated-value non-cyclic 107 Non-bridging 5a
+@c LocalWords: 866025403784439 non-private d-b templatedModule k-1
+@c LocalWords: templatedModule_string_int_real Wrapper_Number 36 5E
+@c LocalWords: Wrapper_real higher-order Three-dimensional log-log
+@c LocalWords: two-variable true-element higher-quality post-scaled
+@c LocalWords: polar-coordinate auto-generated textbook-style 1000
+@c LocalWords: scientific-style graphwithderiv least-squares 5cm 38
+@c LocalWords: 256 32766 32761 divs quantized fillcontour 67 57 48
+@c LocalWords: shape-invariant 2010021-2010022 vice-versa ibl EXR
+@c LocalWords: three_surface three_light plain_prethree image-based
+@c LocalWords: pre-rendered imageDir imageURL cudareflect teapotIBL
+@c LocalWords: patch-dependent vertex-dependent O--X 2N--2E--E 561
+@c LocalWords: vertex-specific three-dimensions Ctrl-q iframe 321
+@c LocalWords: frameborder 48kB stand-alone 2n 100d v3d pyv3d v2-c
+@c LocalWords: importv3d v1-c O--O u--O v--O v--cycle x-0 5z y-0 5y
+@c LocalWords: z-0 O--v u--v a-d b-d c-d near_earth c--c nslice 20
+@c LocalWords: O--1 5unit three_arrows diamond-shaped right-angled
+@c LocalWords: 2-y public-domain in-depth field-defining 144x144 'e
+@c LocalWords: ASYMPTOTE_CONFIG non-writable 200 semi-colon ctrl-C
+@c LocalWords: asy_history auto-completion Button-1 Button-2 LSP
+@c LocalWords: rsvg-convert librsvg2-tools dvisvgmMultipleFiles lsp
+@c LocalWords: data-binary 'import lsp-mode 'package melpa 'asyls
+@c LocalWords: 'package-archives package-initialize package-install
+@c LocalWords: package-refresh-contents 'lsp-mode make-lsp-client
+@c LocalWords: 'lsp-language-id-configuration lsp-register-client
+@c LocalWords: new-connection lsp-stdio-connection activation-fn
+@c LocalWords: lsp-activate-on major-modes server-id user-generated
+@c LocalWords: line-based code-based plain_debugger Guib Skitsko
+@c LocalWords: Chaumont Cheng
diff --git a/Build/source/utils/asymptote/doc/install-sh b/Build/source/utils/asymptote/doc/install-sh
index 7c56c9c0151..6781b987bdb 100755
--- a/Build/source/utils/asymptote/doc/install-sh
+++ b/Build/source/utils/asymptote/doc/install-sh
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2023-11-23.18; # UTC
+scriptversion=2009-04-28.21; # UTC
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -35,21 +35,25 @@ scriptversion=2023-11-23.18; # UTC
# FSF changes to this file are in the public domain.
#
# Calling this script install-sh is preferred over install.sh, to prevent
-# 'make' implicit rules from creating a file called install from it
+# `make' implicit rules from creating a file called install from it
# when there is no Makefile.
#
# This script is compatible with the BSD install script, but was written
# from scratch.
-tab=' '
nl='
'
-IFS=" $tab$nl"
+IFS=" "" $nl"
-# Set DOITPROG to "echo" to test this script.
+# set DOITPROG to echo to test this script
+# Don't use :- since 4.3BSD and earlier shells don't like it.
doit=${DOITPROG-}
-doit_exec=${doit:-exec}
+if test -z "$doit"; then
+ doit_exec=exec
+else
+ doit_exec=$doit
+fi
# Put in absolute file names if you don't have them in your path;
# or use environment vars.
@@ -64,16 +68,22 @@ mvprog=${MVPROG-mv}
rmprog=${RMPROG-rm}
stripprog=${STRIPPROG-strip}
+posix_glob='?'
+initialize_posix_glob='
+ test "$posix_glob" != "?" || {
+ if (set -f) 2>/dev/null; then
+ posix_glob=
+ else
+ posix_glob=:
+ fi
+ }
+'
+
posix_mkdir=
# Desired mode of installed file.
mode=0755
-# Create dirs (including intermediate dirs) using mode 755.
-# This is like GNU 'install' as of coreutils 8.32 (2020).
-mkdir_umask=22
-
-backupsuffix=
chgrpcmd=
chmodcmd=$chmodprog
chowncmd=
@@ -87,7 +97,7 @@ dir_arg=
dst_arg=
copy_on_change=false
-is_target_a_directory=possibly
+no_target_directory=
usage="\
Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
@@ -104,29 +114,19 @@ Options:
--version display version info and exit.
-c (ignored)
- -C install only if different (preserve data modification time)
+ -C install only if different (preserve the last data modification time)
-d create directories instead of installing files.
-g GROUP $chgrpprog installed files to GROUP.
-m MODE $chmodprog installed files to MODE.
-o USER $chownprog installed files to USER.
- -p pass -p to $cpprog.
-s $stripprog installed files.
- -S SUFFIX attempt to back up existing files, with suffix SUFFIX.
-t DIRECTORY install into DIRECTORY.
-T report an error if DSTFILE is a directory.
Environment variables override the default commands:
CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
RMPROG STRIPPROG
-
-By default, rm is invoked with -f; when overridden with RMPROG,
-it's up to you to specify -f if you want it.
-
-If -S is not specified, no backups are attempted.
-
-Report bugs to <bug-automake@gnu.org>.
-GNU Automake home page: <https://www.gnu.org/software/automake/>.
-General help using GNU software: <https://www.gnu.org/gethelp/>."
+"
while test $# -ne 0; do
case $1 in
@@ -137,62 +137,42 @@ while test $# -ne 0; do
-d) dir_arg=true;;
-g) chgrpcmd="$chgrpprog $2"
- shift;;
+ shift;;
--help) echo "$usage"; exit $?;;
-m) mode=$2
- case $mode in
- *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*)
- echo "$0: invalid mode: $mode" >&2
- exit 1;;
- esac
- shift;;
+ case $mode in
+ *' '* | *' '* | *'
+'* | *'*'* | *'?'* | *'['*)
+ echo "$0: invalid mode: $mode" >&2
+ exit 1;;
+ esac
+ shift;;
-o) chowncmd="$chownprog $2"
- shift;;
-
- -p) cpprog="$cpprog -p";;
+ shift;;
-s) stripcmd=$stripprog;;
- -S) backupsuffix="$2"
- shift;;
-
- -t)
- is_target_a_directory=always
- dst_arg=$2
- # Protect names problematic for 'test' and other utilities.
- case $dst_arg in
- -* | [=\(\)!]) dst_arg=./$dst_arg;;
- esac
- shift;;
+ -t) dst_arg=$2
+ shift;;
- -T) is_target_a_directory=never;;
+ -T) no_target_directory=true;;
--version) echo "$0 $scriptversion"; exit $?;;
- --) shift
- break;;
+ --) shift
+ break;;
- -*) echo "$0: invalid option: $1" >&2
- exit 1;;
+ -*) echo "$0: invalid option: $1" >&2
+ exit 1;;
*) break;;
esac
shift
done
-# We allow the use of options -d and -T together, by making -d
-# take the precedence; this is for compatibility with GNU install.
-
-if test -n "$dir_arg"; then
- if test -n "$dst_arg"; then
- echo "$0: target directory not allowed when installing a directory." >&2
- exit 1
- fi
-fi
-
if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
# When -d is used, all remaining arguments are directories to create.
# When -t is used, the destination is already specified.
@@ -206,10 +186,6 @@ if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
fi
shift # arg
dst_arg=$arg
- # Protect names problematic for 'test' and other utilities.
- case $dst_arg in
- -* | [=\(\)!]) dst_arg=./$dst_arg;;
- esac
done
fi
@@ -218,26 +194,13 @@ if test $# -eq 0; then
echo "$0: no input file specified." >&2
exit 1
fi
- # It's OK to call 'install-sh -d' without argument.
+ # It's OK to call `install-sh -d' without argument.
# This can happen when creating conditional directories.
exit 0
fi
if test -z "$dir_arg"; then
- if test $# -gt 1 || test "$is_target_a_directory" = always; then
- if test ! -d "$dst_arg"; then
- echo "$0: $dst_arg: Is not a directory." >&2
- exit 1
- fi
- fi
-fi
-
-if test -z "$dir_arg"; then
- do_exit='(exit $ret); exit $ret'
- trap "ret=129; $do_exit" 1
- trap "ret=130; $do_exit" 2
- trap "ret=141; $do_exit" 13
- trap "ret=143; $do_exit" 15
+ trap '(exit $?); exit' 1 2 13 15
# Set umask so as not to create temps with too-generous modes.
# However, 'strip' requires both read and write access to temps.
@@ -248,16 +211,16 @@ if test -z "$dir_arg"; then
*[0-7])
if test -z "$stripcmd"; then
- u_plus_rw=
+ u_plus_rw=
else
- u_plus_rw='% 200'
+ u_plus_rw='% 200'
fi
cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
*)
if test -z "$stripcmd"; then
- u_plus_rw=
+ u_plus_rw=
else
- u_plus_rw=,u+rw
+ u_plus_rw=,u+rw
fi
cp_umask=$mode$u_plus_rw;;
esac
@@ -265,9 +228,9 @@ fi
for src
do
- # Protect names problematic for 'test' and other utilities.
+ # Protect names starting with `-'.
case $src in
- -* | [=\(\)!]) src=./$src;;
+ -*) src=./$src;;
esac
if test -n "$dir_arg"; then
@@ -275,10 +238,6 @@ do
dstdir=$dst
test -d "$dstdir"
dstdir_status=$?
- # Don't chown directories that already exist.
- if test $dstdir_status = 0; then
- chowncmd=""
- fi
else
# Waiting for this to be detected by the "$cpprog $src $dsttmp" command
@@ -293,150 +252,185 @@ do
echo "$0: no destination specified." >&2
exit 1
fi
+
dst=$dst_arg
+ # Protect names starting with `-'.
+ case $dst in
+ -*) dst=./$dst;;
+ esac
- # If destination is a directory, append the input filename.
+ # If destination is a directory, append the input filename; won't work
+ # if double slashes aren't ignored.
if test -d "$dst"; then
- if test "$is_target_a_directory" = never; then
- echo "$0: $dst_arg: Is a directory" >&2
- exit 1
+ if test -n "$no_target_directory"; then
+ echo "$0: $dst_arg: Is a directory" >&2
+ exit 1
fi
dstdir=$dst
- dstbase=`basename "$src"`
- case $dst in
- */) dst=$dst$dstbase;;
- *) dst=$dst/$dstbase;;
- esac
+ dst=$dstdir/`basename "$src"`
dstdir_status=0
else
- dstdir=`dirname "$dst"`
+ # Prefer dirname, but fall back on a substitute if dirname fails.
+ dstdir=`
+ (dirname "$dst") 2>/dev/null ||
+ expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$dst" : 'X\(//\)[^/]' \| \
+ X"$dst" : 'X\(//\)$' \| \
+ X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
+ echo X"$dst" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'
+ `
+
test -d "$dstdir"
dstdir_status=$?
fi
fi
- case $dstdir in
- */) dstdirslash=$dstdir;;
- *) dstdirslash=$dstdir/;;
- esac
-
obsolete_mkdir_used=false
if test $dstdir_status != 0; then
case $posix_mkdir in
'')
- # With -d, create the new directory with the user-specified mode.
- # Otherwise, rely on $mkdir_umask.
- if test -n "$dir_arg"; then
- mkdir_mode=-m$mode
- else
- mkdir_mode=
- fi
-
- posix_mkdir=false
- # The $RANDOM variable is not portable (e.g., dash). Use it
- # here however when possible just to lower collision chance.
- tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
-
- trap '
- ret=$?
- rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null
- exit $ret
- ' 0
-
- # Because "mkdir -p" follows existing symlinks and we likely work
- # directly in world-writeable /tmp, make sure that the '$tmpdir'
- # directory is successfully created first before we actually test
- # 'mkdir -p'.
- if (umask $mkdir_umask &&
- $mkdirprog $mkdir_mode "$tmpdir" &&
- exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
- then
- if test -z "$dir_arg" || {
- # Check for POSIX incompatibilities with -m.
- # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
- # other-writable bit of parent directory when it shouldn't.
- # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
- test_tmpdir="$tmpdir/a"
- ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
- case $ls_ld_tmpdir in
- d????-?r-*) different_mode=700;;
- d????-?--*) different_mode=755;;
- *) false;;
- esac &&
- $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
- ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
- test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
- }
- }
- then posix_mkdir=:
- fi
- rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
+ # Create intermediate dirs using mode 755 as modified by the umask.
+ # This is like FreeBSD 'install' as of 1997-10-28.
+ umask=`umask`
+ case $stripcmd.$umask in
+ # Optimize common cases.
+ *[2367][2367]) mkdir_umask=$umask;;
+ .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
+
+ *[0-7])
+ mkdir_umask=`expr $umask + 22 \
+ - $umask % 100 % 40 + $umask % 20 \
+ - $umask % 10 % 4 + $umask % 2
+ `;;
+ *) mkdir_umask=$umask,go-w;;
+ esac
+
+ # With -d, create the new directory with the user-specified mode.
+ # Otherwise, rely on $mkdir_umask.
+ if test -n "$dir_arg"; then
+ mkdir_mode=-m$mode
else
- # Remove any dirs left behind by ancient mkdir implementations.
- rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
+ mkdir_mode=
fi
- trap '' 0;;
+
+ posix_mkdir=false
+ case $umask in
+ *[123567][0-7][0-7])
+ # POSIX mkdir -p sets u+wx bits regardless of umask, which
+ # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
+ ;;
+ *)
+ tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+ trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
+
+ if (umask $mkdir_umask &&
+ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
+ then
+ if test -z "$dir_arg" || {
+ # Check for POSIX incompatibilities with -m.
+ # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+ # other-writeable bit of parent directory when it shouldn't.
+ # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+ ls_ld_tmpdir=`ls -ld "$tmpdir"`
+ case $ls_ld_tmpdir in
+ d????-?r-*) different_mode=700;;
+ d????-?--*) different_mode=755;;
+ *) false;;
+ esac &&
+ $mkdirprog -m$different_mode -p -- "$tmpdir" && {
+ ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+ test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+ }
+ }
+ then posix_mkdir=:
+ fi
+ rmdir "$tmpdir/d" "$tmpdir"
+ else
+ # Remove any dirs left behind by ancient mkdir implementations.
+ rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+ fi
+ trap '' 0;;
+ esac;;
esac
if
$posix_mkdir && (
- umask $mkdir_umask &&
- $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+ umask $mkdir_umask &&
+ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
)
then :
else
- # mkdir does not conform to POSIX,
+ # The umask is ridiculous, or mkdir does not conform to POSIX,
# or it failed possibly due to a race condition. Create the
# directory the slow way, step by step, checking for races as we go.
case $dstdir in
- /*) prefix='/';;
- [-=\(\)!]*) prefix='./';;
- *) prefix='';;
+ /*) prefix='/';;
+ -*) prefix='./';;
+ *) prefix='';;
esac
+ eval "$initialize_posix_glob"
+
oIFS=$IFS
IFS=/
- set -f
+ $posix_glob set -f
set fnord $dstdir
shift
- set +f
+ $posix_glob set +f
IFS=$oIFS
prefixes=
for d
do
- test X"$d" = X && continue
-
- prefix=$prefix$d
- if test -d "$prefix"; then
- prefixes=
- else
- if $posix_mkdir; then
- (umask $mkdir_umask &&
- $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
- # Don't fail if two instances are running concurrently.
- test -d "$prefix" || exit 1
- else
- case $prefix in
- *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
- *) qprefix=$prefix;;
- esac
- prefixes="$prefixes '$qprefix'"
- fi
- fi
- prefix=$prefix/
+ test -z "$d" && continue
+
+ prefix=$prefix$d
+ if test -d "$prefix"; then
+ prefixes=
+ else
+ if $posix_mkdir; then
+ (umask=$mkdir_umask &&
+ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+ # Don't fail if two instances are running concurrently.
+ test -d "$prefix" || exit 1
+ else
+ case $prefix in
+ *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+ *) qprefix=$prefix;;
+ esac
+ prefixes="$prefixes '$qprefix'"
+ fi
+ fi
+ prefix=$prefix/
done
if test -n "$prefixes"; then
- # Don't fail if two instances are running concurrently.
- (umask $mkdir_umask &&
- eval "\$doit_exec \$mkdirprog $prefixes") ||
- test -d "$dstdir" || exit 1
- obsolete_mkdir_used=true
+ # Don't fail if two instances are running concurrently.
+ (umask $mkdir_umask &&
+ eval "\$doit_exec \$mkdirprog $prefixes") ||
+ test -d "$dstdir" || exit 1
+ obsolete_mkdir_used=true
fi
fi
fi
@@ -449,25 +443,14 @@ do
else
# Make a couple of temp file names in the proper directory.
- dsttmp=${dstdirslash}_inst.$$_
- rmtmp=${dstdirslash}_rm.$$_
+ dsttmp=$dstdir/_inst.$$_
+ rmtmp=$dstdir/_rm.$$_
# Trap to clean up those temp files at exit.
trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
# Copy the file name to the temp name.
- (umask $cp_umask &&
- { test -z "$stripcmd" || {
- # Create $dsttmp read-write so that cp doesn't create it read-only,
- # which would cause strip to fail.
- if test -z "$doit"; then
- : >"$dsttmp" # No need to fork-exec 'touch'.
- else
- $doit touch "$dsttmp"
- fi
- }
- } &&
- $doit_exec $cpprog "$src" "$dsttmp") &&
+ (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
# and set any options; do chmod last to preserve setuid bits.
#
@@ -482,24 +465,20 @@ do
# If -C, don't bother to copy if it wouldn't change the file.
if $copy_on_change &&
- old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
- new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
- set -f &&
+ old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
+ new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
+
+ eval "$initialize_posix_glob" &&
+ $posix_glob set -f &&
set X $old && old=:$2:$4:$5:$6 &&
set X $new && new=:$2:$4:$5:$6 &&
- set +f &&
+ $posix_glob set +f &&
+
test "$old" = "$new" &&
$cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
then
rm -f "$dsttmp"
else
- # If $backupsuffix is set, and the file being installed
- # already exists, attempt a backup. Don't worry if it fails,
- # e.g., if mv doesn't support -f.
- if test -n "$backupsuffix" && test -f "$dst"; then
- $doit $mvcmd -f "$dst" "$dst$backupsuffix" 2>/dev/null
- fi
-
# Rename the file to the real destination.
$doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
@@ -507,24 +486,24 @@ do
# to itself, or perhaps because mv is so ancient that it does not
# support -f.
{
- # Now remove or move aside any old file at destination location.
- # We try this two ways since rm can't unlink itself on some
- # systems and the destination file might be busy for other
- # reasons. In this case, the final cleanup might fail but the new
- # file should still install successfully.
- {
- test ! -f "$dst" ||
- $doit $rmcmd "$dst" 2>/dev/null ||
- { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
- { $doit $rmcmd "$rmtmp" 2>/dev/null; :; }
- } ||
- { echo "$0: cannot unlink or rename $dst" >&2
- (exit 1); exit 1
- }
- } &&
-
- # Now rename the file to the real destination.
- $doit $mvcmd "$dsttmp" "$dst"
+ # Now remove or move aside any old file at destination location.
+ # We try this two ways since rm can't unlink itself on some
+ # systems and the destination file might be busy for other
+ # reasons. In this case, the final cleanup might fail but the new
+ # file should still install successfully.
+ {
+ test ! -f "$dst" ||
+ $doit $rmcmd -f "$dst" 2>/dev/null ||
+ { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+ { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+ } ||
+ { echo "$0: cannot unlink or rename $dst" >&2
+ (exit 1); exit 1
+ }
+ } &&
+
+ # Now rename the file to the real destination.
+ $doit $mvcmd "$dsttmp" "$dst"
}
fi || exit 1
@@ -533,9 +512,9 @@ do
done
# Local variables:
-# eval: (add-hook 'before-save-hook 'time-stamp)
+# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC0"
+# time-stamp-time-zone: "UTC"
# time-stamp-end: "; # UTC"
# End:
diff --git a/Build/source/utils/asymptote/doc/latexmkrc b/Build/source/utils/asymptote/doc/latexmkrc
index fbc52a98d2e..646594e4dad 100644
--- a/Build/source/utils/asymptote/doc/latexmkrc
+++ b/Build/source/utils/asymptote/doc/latexmkrc
@@ -1,4 +1,5 @@
-sub asy {return system("asy \"$_[0]\"");}
+sub asy {return system("asy -o '$_[0]' '$_[0]'");}
add_cus_dep("asy","eps",0,"asy");
add_cus_dep("asy","pdf",0,"asy");
add_cus_dep("asy","tex",0,"asy");
+push @generated_exts, "pre", "%R-[0-9]*.pdf", "%R-[0-9]*.prc", "%R-[0-9]*.tex", "%R-[0-9]*.out", "%R-[0-9]*.pbsdat", "%R.pbsdat", "%R-[0-9]*.eps", "%R-*.asy" \ No newline at end of file
diff --git a/Build/source/utils/asymptote/doc/latexmkrc_asydir b/Build/source/utils/asymptote/doc/latexmkrc_asydir
deleted file mode 100644
index 043084e8e6d..00000000000
--- a/Build/source/utils/asymptote/doc/latexmkrc_asydir
+++ /dev/null
@@ -1,4 +0,0 @@
-sub asy {return system("asy -o asy/ '$_[0]'");}
-add_cus_dep("asy","eps",0,"asy");
-add_cus_dep("asy","pdf",0,"asy");
-add_cus_dep("asy","tex",0,"asy");
diff --git a/Build/source/utils/asymptote/doc/png/asymptote.info b/Build/source/utils/asymptote/doc/png/asymptote.info
index 78edd9ad026..c3633800c78 100644
--- a/Build/source/utils/asymptote/doc/png/asymptote.info
+++ b/Build/source/utils/asymptote/doc/png/asymptote.info
@@ -1,11 +1,11 @@
-This is asymptote.info, produced by makeinfo version 6.8 from
+This is asymptote.info, produced by makeinfo version 7.0.2 from
asymptote.texi.
-This file documents 'Asymptote', version 2.85.
+This file documents ‘Asymptote’, version 2.87.
<https://asymptote.sourceforge.io>
- Copyright (C) 2004-23 Andy Hammerlindl, John Bowman, and Tom Prince.
+ Copyright © 2004-24 Andy Hammerlindl, John Bowman, and Tom Prince.
Permission is granted to copy, distribute and/or modify this
document under the terms of the GNU Lesser General Public License
@@ -22,11 +22,11 @@ File: asymptote.info, Node: Top, Next: Description, Prev: (dir), Up: (dir)
Asymptote
*********
-This file documents 'Asymptote', version 2.85.
+This file documents ‘Asymptote’, version 2.87.
<https://asymptote.sourceforge.io>
- Copyright (C) 2004-23 Andy Hammerlindl, John Bowman, and Tom Prince.
+ Copyright © 2004-24 Andy Hammerlindl, John Bowman, and Tom Prince.
Permission is granted to copy, distribute and/or modify this
document under the terms of the GNU Lesser General Public License
@@ -34,45 +34,45 @@ This file documents 'Asymptote', version 2.85.
* Menu:
-* Description:: What is 'Asymptote'?
+* Description:: What is ‘Asymptote’?
* Installation:: Downloading and installing
* Tutorial:: Getting started
* Drawing commands:: Four primitive graphics commands
* Bezier curves:: Path connectors and direction specifiers
-* Programming:: The 'Asymptote' vector graphics language
-* LaTeX usage:: Embedding 'Asymptote' commands within 'LaTeX'
-* Base modules:: Base modules shipped with 'Asymptote'
+* Programming:: The ‘Asymptote’ vector graphics language
+* LaTeX usage:: Embedding ‘Asymptote’ commands within ‘LaTeX’
+* Base modules:: Base modules shipped with ‘Asymptote’
* Options:: Command-line options
-* Interactive mode:: Typing 'Asymptote' commands interactively
+* Interactive mode:: Typing ‘Asymptote’ commands interactively
* GUI:: Graphical user interface
* Command-Line Interface:: Remote command-line interface
* Language server protocol:: Help when writing code
-* PostScript to Asymptote:: 'Asymptote' backend to 'pstoedit'
+* PostScript to Asymptote:: ‘Asymptote’ backend to ‘pstoedit’
* Help:: Where to get help and submit bug reports
* Debugger:: Squish those bugs!
* Credits:: Contributions and acknowledgments
* Index:: General index
- -- The Detailed Node Listing --
+ — The Detailed Node Listing —
Installation
-* UNIX binary distributions:: Prebuilt 'UNIX' binaries
-* MacOS X binary distributions:: Prebuilt 'MacOS X' binaries
-* Microsoft Windows:: Prebuilt 'Microsoft Windows' binary
-* Configuring:: Configuring 'Asymptote' for your system
-* Search paths:: Where 'Asymptote' looks for your files
-* Compiling from UNIX source:: Building 'Asymptote' from scratch
-* Editing modes:: Convenient 'emacs' and 'vim' modes
+* UNIX binary distributions:: Prebuilt ‘UNIX’ binaries
+* MacOS X binary distributions:: Prebuilt ‘MacOS X’ binaries
+* Microsoft Windows:: Prebuilt ‘Microsoft Windows’ binary
+* Configuring:: Configuring ‘Asymptote’ for your system
+* Search paths:: Where ‘Asymptote’ looks for your files
+* Compiling from UNIX source:: Building ‘Asymptote’ from scratch
+* Editing modes:: Convenient ‘emacs’ and ‘vim’ modes
* Git:: Getting the latest development source
-* Uninstall:: Goodbye, 'Asymptote'!
+* Uninstall:: Goodbye, ‘Asymptote’!
Tutorial
-* Drawing in batch mode:: Run 'Asymptote' on a text file
-* Drawing in interactive mode:: Running 'Asymptote' interactively
+* Drawing in batch mode:: Run ‘Asymptote’ on a text file
+* Drawing in interactive mode:: Running ‘Asymptote’ interactively
* Figure size:: Specifying the figure size
-* Labels:: Adding 'LaTeX' labels
+* Labels:: Adding ‘LaTeX’ labels
* Paths:: Drawing lines and curves
Drawing commands
@@ -97,7 +97,7 @@ Programming
* Functions:: Traditional and high-order functions
* Arrays:: Dynamic vectors
* Casts:: Implicit and explicit casts
-* Import:: Importing external 'Asymptote' modules
+* Import:: Importing external ‘Asymptote’ modules
* Static:: Where to allocate your variable?
Operators
@@ -117,11 +117,15 @@ Arrays
* Slices:: Python-style array slices
+Import
+
+* Templated imports::
+
Base modules
-* plain:: Default 'Asymptote' base file
+* plain:: Default ‘Asymptote’ base file
* simplex:: Linear programming: simplex method
-* math:: Extend 'Asymptote''s math capabilities
+* math:: Extend ‘Asymptote’’s math capabilities
* interpolate:: Interpolation routines
* geometry:: Geometry routines
* trembling:: Wavy lines
@@ -137,9 +141,9 @@ Base modules
* roundedpath:: Round the sharp corners of paths
* animation:: Embedded PDF and MPEG movies
* embed:: Embedding movies, sounds, and 3D objects
-* slide:: Making presentations with 'Asymptote'
-* MetaPost:: 'MetaPost' compatibility routines
-* babel:: Interface to 'LaTeX' 'babel' package
+* slide:: Making presentations with ‘Asymptote’
+* MetaPost:: ‘MetaPost’ compatibility routines
+* babel:: Interface to ‘LaTeX’ ‘babel’ package
* labelpath:: Drawing curved labels
* labelpath3:: Drawing curved labels in 3D
* annotate:: Annotate your PDF files
@@ -161,8 +165,8 @@ Base modules
Graphical User Interface
-* GUI installation:: Installing 'xasy'
-* GUI usage:: Using 'xasy' to edit objects
+* GUI installation:: Installing ‘xasy’
+* GUI usage:: Using ‘xasy’ to edit objects

@@ -171,93 +175,93 @@ File: asymptote.info, Node: Description, Next: Installation, Prev: Top, Up:
1 Description
*************
-'Asymptote' is a powerful descriptive vector graphics language that
+‘Asymptote’ is a powerful descriptive vector graphics language that
provides a mathematical coordinate-based framework for technical
-drawing. Labels and equations are typeset with 'LaTeX', for overall
+drawing. Labels and equations are typeset with ‘LaTeX’, for overall
document consistency, yielding the same high-quality level of
-typesetting that 'LaTeX' provides for scientific text. By default it
-produces 'PostScript' output, but it can also generate 'OpenGL', 'PDF',
-'SVG', 'WebGL', 'V3D', and 'PRC' vector graphics, along with any format
-that the 'ImageMagick' package can produce. You can even try it out in
-your Web browser without installing it, using the 'Asymptote Web
-Application'
+typesetting that ‘LaTeX’ provides for scientific text. By default it
+produces ‘PostScript’ output, but it can also generate ‘OpenGL’, ‘PDF’,
+‘SVG’, ‘WebGL’, ‘V3D’, and ‘PRC’ vector graphics, along with any format
+that the ‘ImageMagick’ package can produce. You can even try it out in
+your Web browser without installing it, using the ‘Asymptote Web
+Application’
<http://asymptote.ualberta.ca>
It is also possible to send remote commands to this server via the
curl utility (*note Command-Line Interface::).
- A major advantage of 'Asymptote' over other graphics packages is that
+ A major advantage of ‘Asymptote’ over other graphics packages is that
it is a high-level programming language, as opposed to just a graphics
program: it can therefore exploit the best features of the script
(command-driven) and graphical-user-interface (GUI) methods for
-producing figures. The rudimentary GUI 'xasy' included with the package
-allows one to move script-generated objects around. To make 'Asymptote'
+producing figures. The rudimentary GUI ‘xasy’ included with the package
+allows one to move script-generated objects around. To make ‘Asymptote’
accessible to the average user, this GUI is currently being developed
into a full-fledged interface that can generate objects directly.
However, the script portion of the language is now ready for general use
-by users who are willing to learn a few simple 'Asymptote' graphics
+by users who are willing to learn a few simple ‘Asymptote’ graphics
commands (*note Drawing commands::).
- 'Asymptote' is mathematically oriented (e.g. one can use complex
-multiplication to rotate a vector) and uses 'LaTeX' to do the
+ ‘Asymptote’ is mathematically oriented (e.g. one can use complex
+multiplication to rotate a vector) and uses ‘LaTeX’ to do the
typesetting of labels. This is an important feature for scientific
applications. It was inspired by an earlier drawing program (with a
-weaker syntax and capabilities) called 'MetaPost'.
+weaker syntax and capabilities) called ‘MetaPost’.
- The 'Asymptote' vector graphics language provides:
+ The ‘Asymptote’ vector graphics language provides:
- * a standard for typesetting mathematical figures, just as
- TeX/'LaTeX' is the de-facto standard for typesetting equations.
+ • a standard for typesetting mathematical figures, just as
+ TeX/‘LaTeX’ is the de-facto standard for typesetting equations.
- * 'LaTeX' typesetting of labels, for overall document consistency;
+ • ‘LaTeX’ typesetting of labels, for overall document consistency;
- * the ability to generate and embed 3D vector WebGL graphics within
+ • the ability to generate and embed 3D vector WebGL graphics within
HTML files;
- * the ability to generate and embed 3D vector PRC graphics within PDF
+ • the ability to generate and embed 3D vector PRC graphics within PDF
files;
- * a natural coordinate-based framework for technical drawing,
- inspired by 'MetaPost', with a much cleaner, powerful C++-like
+ • a natural coordinate-based framework for technical drawing,
+ inspired by ‘MetaPost’, with a much cleaner, powerful C++-like
programming syntax;
- * compilation of figures into virtual machine code for speed, without
+ • compilation of figures into virtual machine code for speed, without
sacrificing portability;
- * the power of a script-based language coupled to the convenience of
+ • the power of a script-based language coupled to the convenience of
a GUI;
- * customization using its own C++-like graphics programming language;
+ • customization using its own C++-like graphics programming language;
- * sensible defaults for graphical features, with the ability to
+ • sensible defaults for graphical features, with the ability to
override;
- * a high-level mathematically oriented interface to the 'PostScript'
+ • a high-level mathematically oriented interface to the ‘PostScript’
language for vector graphics, including affine transforms and
complex variables;
- * functions that can create new (anonymous) functions;
+ • functions that can create new (anonymous) functions;
- * deferred drawing that uses the simplex method to solve overall size
+ • deferred drawing that uses the simplex method to solve overall size
constraint issues between fixed-sized objects (labels and
arrowheads) and objects that should scale with figure size;
- Many of the features of 'Asymptote' are written in the 'Asymptote'
-language itself. While the stock version of 'Asymptote' is designed for
-mathematics typesetting needs, one can write 'Asymptote' modules that
+ Many of the features of ‘Asymptote’ are written in the ‘Asymptote’
+language itself. While the stock version of ‘Asymptote’ is designed for
+mathematics typesetting needs, one can write ‘Asymptote’ modules that
tailor it to specific applications; for example, a scientific graphing
-module is available (*note graph::). Examples of 'Asymptote' code and
+module is available (*note graph::). Examples of ‘Asymptote’ code and
output, including animations, are available at
<https://asymptote.sourceforge.io/gallery/>
-Clicking on an example file name in this manual, like 'Pythagoras', will
-display the PDF output, whereas clicking on its '.asy' extension will
-show the corresponding 'Asymptote' code in a separate window.
+Clicking on an example file name in this manual, like ‘Pythagoras’, will
+display the PDF output, whereas clicking on its ‘.asy’ extension will
+show the corresponding ‘Asymptote’ code in a separate window.
Links to many external resources, including an excellent user-written
-'Asymptote' tutorial can be found at
+‘Asymptote’ tutorial can be found at
<https://asymptote.sourceforge.io/links.html>
- A quick reference card for 'Asymptote' is available at
+ A quick reference card for ‘Asymptote’ is available at
<https://asymptote.sourceforge.io/asyRefCard.pdf>

@@ -268,22 +272,22 @@ File: asymptote.info, Node: Installation, Next: Tutorial, Prev: Description,
* Menu:
-* UNIX binary distributions:: Prebuilt 'UNIX' binaries
-* MacOS X binary distributions:: Prebuilt 'MacOS X' binaries
-* Microsoft Windows:: Prebuilt 'Microsoft Windows' binary
-* Configuring:: Configuring 'Asymptote' for your system
-* Search paths:: Where 'Asymptote' looks for your files
-* Compiling from UNIX source:: Building 'Asymptote' from scratch
-* Editing modes:: Convenient 'emacs' and 'vim' modes
+* UNIX binary distributions:: Prebuilt ‘UNIX’ binaries
+* MacOS X binary distributions:: Prebuilt ‘MacOS X’ binaries
+* Microsoft Windows:: Prebuilt ‘Microsoft Windows’ binary
+* Configuring:: Configuring ‘Asymptote’ for your system
+* Search paths:: Where ‘Asymptote’ looks for your files
+* Compiling from UNIX source:: Building ‘Asymptote’ from scratch
+* Editing modes:: Convenient ‘emacs’ and ‘vim’ modes
* Git:: Getting the latest development source
-* Uninstall:: Goodbye, 'Asymptote'!
+* Uninstall:: Goodbye, ‘Asymptote’!
After following the instructions for your specific distribution, please
see also *note Configuring::.
We recommend subscribing to new release announcements at
<https://sourceforge.net/projects/asymptote>
-Users may also wish to monitor the 'Asymptote' forum:
+Users may also wish to monitor the ‘Asymptote’ forum:
<https://sourceforge.net/p/asymptote/discussion/409349>

@@ -292,24 +296,24 @@ File: asymptote.info, Node: UNIX binary distributions, Next: MacOS X binary di
2.1 UNIX binary distributions
=============================
-We release both 'tgz' and RPM binary distributions of 'Asymptote'. The
-root user can install the 'Linux x86_64' 'tgz' distribution of version
-'x.xx' of 'Asymptote' with the commands:
+We release both ‘tgz’ and RPM binary distributions of ‘Asymptote’. The
+root user can install the ‘Linux x86_64’ ‘tgz’ distribution of version
+‘x.xx’ of ‘Asymptote’ with the commands:
tar -C / -zxf asymptote-x.xx.x86_64.tgz
texhash
-The 'texhash' command, which installs LaTeX style files, is optional.
-The executable file will be '/usr/local/bin/asy') and example code will
-be installed by default in '/usr/local/share/doc/asymptote/examples'.
+The ‘texhash’ command, which installs LaTeX style files, is optional.
+The executable file will be ‘/usr/local/bin/asy’) and example code will
+be installed by default in ‘/usr/local/share/doc/asymptote/examples’.
-Fedora users can easily install a recent version of 'Asymptote' with the
+Fedora users can easily install a recent version of ‘Asymptote’ with the
command
dnf --enablerepo=rawhide install asymptote
-To install the latest version of 'Asymptote' on a Debian-based
+To install the latest version of ‘Asymptote’ on a Debian-based
distribution (e.g. Ubuntu, Mepis, Linspire) follow the instructions for
-compiling from 'UNIX' source (*note Compiling from UNIX source::).
-Alternatively, Debian users can install one of Hubert Chan's prebuilt
-'Asymptote' binaries from
+compiling from ‘UNIX’ source (*note Compiling from UNIX source::).
+Alternatively, Debian users can install one of Hubert Chan’s prebuilt
+‘Asymptote’ binaries from
<http://ftp.debian.org/debian/pool/main/a/asymptote>

@@ -318,8 +322,8 @@ File: asymptote.info, Node: MacOS X binary distributions, Next: Microsoft Wind
2.2 MacOS X binary distributions
================================
-'MacOS X' users can either compile the 'UNIX' source code (*note
-Compiling from UNIX source::) or install the 'Asymptote' binary
+‘MacOS X’ users can either compile the ‘UNIX’ source code (*note
+Compiling from UNIX source::) or install the ‘Asymptote’ binary
available at
<https://www.macports.org/>
@@ -328,8 +332,8 @@ available at
<https://brew.sh/>
-Note that many 'MacOS X' (and FreeBSD) systems lack the GNU 'readline'
-library. For full interactive functionality, GNU 'readline' version 4.3
+Note that many ‘MacOS X’ (and FreeBSD) systems lack the GNU ‘readline’
+library. For full interactive functionality, GNU ‘readline’ version 4.3
or later must be installed.

@@ -338,29 +342,29 @@ File: asymptote.info, Node: Microsoft Windows, Next: Configuring, Prev: MacOS
2.3 Microsoft Windows
=====================
-Users of the 'Microsoft Windows' operating system can install the
-self-extracting 'Asymptote' executable 'asymptote-x.xx-setup.exe', where
-'x.xx' denotes the latest version.
+Users of the ‘Microsoft Windows’ operating system can install the
+self-extracting ‘Asymptote’ executable ‘asymptote-x.xx-setup.exe’, where
+‘x.xx’ denotes the latest version.
A working TeX implementation (we recommend
<https://www.tug.org/texlive> or <http://www.miktex.org>) will be
-required to typeset labels. You will also need to install 'GPL
-Ghostscript' version 9.56 or later from <https://www.ghostscript.com/>.
+required to typeset labels. You will also need to install ‘GPL
+Ghostscript’ version 9.56 or later from <https://www.ghostscript.com/>.
- To view 'PostScript' output, you can install the program 'Sumatra
-PDF' available from <https://www.sumatrapdfreader.org/>.
+ To view ‘PostScript’ output, you can install the program ‘Sumatra
+PDF’ available from <https://www.sumatrapdfreader.org/>.
- The 'ImageMagick' package from
+ The ‘ImageMagick’ package from
<https://www.imagemagick.org/script/binary-releases.php>
is required to support output formats other than HTML, PDF, SVG, and PNG
-(*note convert::). The 'Python 3' interpreter from
+(*note convert::). The ‘Python 3’ interpreter from
<https://www.python.org> is only required if you wish to try out the
graphical user interface (*note GUI::).
-Example code will be installed by default in the 'examples' subdirectory
-of the installation directory (by default, 'C:\Program
-Files\Asymptote').
+Example code will be installed by default in the ‘examples’ subdirectory
+of the installation directory (by default, ‘C:\Program
+Files\Asymptote’).

File: asymptote.info, Node: Configuring, Next: Search paths, Prev: Microsoft Windows, Up: Installation
@@ -368,20 +372,20 @@ File: asymptote.info, Node: Configuring, Next: Search paths, Prev: Microsoft
2.4 Configuring
===============
-In interactive mode, or when given the '-V' option (the default when
-running 'Asymptote' on a single file under 'MSDOS'), 'Asymptote' will
-automatically invoke your 'PostScript' viewer ('evince' under 'UNIX') to
-display graphical output. The 'PostScript' viewer should be capable of
-automatically redrawing whenever the output file is updated. The 'UNIX'
-'PostScript' viewer 'gv' supports this (via a 'SIGHUP' signal). Users
-of 'ggv' will need to enable 'Watch file' under 'Edit/PostScript Viewer
-Preferences'.
-
- Configuration variables are most easily set as 'Asymptote' variables
-in an optional configuration file 'config.asy' (*note configuration
-file::). For example, the setting 'pdfviewer' specifies the location of
+In interactive mode, or when given the ‘-V’ option (the default when
+running ‘Asymptote’ on a single file under ‘MSDOS’), ‘Asymptote’ will
+automatically invoke your ‘PostScript’ viewer (‘evince’ under ‘UNIX’) to
+display graphical output. The ‘PostScript’ viewer should be capable of
+automatically redrawing whenever the output file is updated. The ‘UNIX’
+‘PostScript’ viewer ‘gv’ supports this (via a ‘SIGHUP’ signal). Users
+of ‘ggv’ will need to enable ‘Watch file’ under ‘Edit/PostScript Viewer
+Preferences’.
+
+ Configuration variables are most easily set as ‘Asymptote’ variables
+in an optional configuration file ‘config.asy’ (*note configuration
+file::). For example, the setting ‘pdfviewer’ specifies the location of
the PDF viewer. Here are the default values of several important
-configuration variables under 'UNIX':
+configuration variables under ‘UNIX’:
import settings;
pdfviewer="acroread";
@@ -392,44 +396,44 @@ animate="animate";
gs="gs";
libgs="";
-Under 'MSDOS', the viewer settings 'htmlviewer', 'pdfviewer',
-'psviewer', 'display', and 'animate' default to the string 'cmd',
+Under ‘MSDOS’, the viewer settings ‘htmlviewer’, ‘pdfviewer’,
+‘psviewer’, ‘display’, and ‘animate’ default to the string ‘cmd’,
requesting the application normally associated with each file type. The
-(installation-dependent) default values of 'gs' and 'libgs' are
-determined automatically from the 'Microsoft Windows' registry. The
-'gs' setting specifies the location of the 'PostScript' processor
-'Ghostscript', available from <https://www.ghostscript.com/>.
-
-The configuration variable 'htmlviewer' specifies the browser to use to
-display 3D 'WebGL' output. The default setting is 'google-chrome' under
-'UNIX' and 'cmd' under 'Microsoft Windows'. Note that 'Internet
-Explorer' does not support 'WebGL'; 'Microsoft Windows' users should set
-their default html browser to 'chrome' or 'microsoft-edge'. By default,
-2D and 3D 'HTML' images expand to the enclosing canvas; this can be
-disabled by setting the configuration variable 'absolute' to 'true'.
-
- On 'UNIX' systems, to support automatic document reloading of 'PDF'
-files in 'Adobe Reader', we recommend copying the file 'reload.js' from
-the 'Asymptote' system directory (by default,
-'/usr/local/share/asymptote' under 'UNIX' to
-'~/.adobe/Acrobat/x.x/JavaScripts/', where 'x.x' represents the
-appropriate 'Adobe Reader' version number. The automatic document
+(installation-dependent) default values of ‘gs’ and ‘libgs’ are
+determined automatically from the ‘Microsoft Windows’ registry. The
+‘gs’ setting specifies the location of the ‘PostScript’ processor
+‘Ghostscript’, available from <https://www.ghostscript.com/>.
+
+The configuration variable ‘htmlviewer’ specifies the browser to use to
+display 3D ‘WebGL’ output. The default setting is ‘google-chrome’ under
+‘UNIX’ and ‘cmd’ under ‘Microsoft Windows’. Note that ‘Internet
+Explorer’ does not support ‘WebGL’; ‘Microsoft Windows’ users should set
+their default html browser to ‘chrome’ or ‘microsoft-edge’. By default,
+2D and 3D ‘HTML’ images expand to the enclosing canvas; this can be
+disabled by setting the configuration variable ‘absolute’ to ‘true’.
+
+ On ‘UNIX’ systems, to support automatic document reloading of ‘PDF’
+files in ‘Adobe Reader’, we recommend copying the file ‘reload.js’ from
+the ‘Asymptote’ system directory (by default,
+‘/usr/local/share/asymptote’ under ‘UNIX’ to
+‘~/.adobe/Acrobat/x.x/JavaScripts/’, where ‘x.x’ represents the
+appropriate ‘Adobe Reader’ version number. The automatic document
reload feature must then be explicitly enabled by putting
import settings;
pdfreload=true;
pdfreloadOptions="-tempFile";
-in the 'Asymptote' configuration file. This reload feature is not
-useful under 'MSDOS' since the document cannot be updated anyway on that
-operating system until it is first closed by 'Adobe Reader'.
+in the ‘Asymptote’ configuration file. This reload feature is not
+useful under ‘MSDOS’ since the document cannot be updated anyway on that
+operating system until it is first closed by ‘Adobe Reader’.
- The configuration variable 'dir' can be used to adjust the search
+ The configuration variable ‘dir’ can be used to adjust the search
path (*note Search paths::).
- By default, 'Asymptote' attempts to center the figure on the page,
-assuming that the paper type is 'letter'. The default paper type may be
-changed to 'a4' with the configuration variable 'papertype'. Alignment
+ By default, ‘Asymptote’ attempts to center the figure on the page,
+assuming that the paper type is ‘letter’. The default paper type may be
+changed to ‘a4’ with the configuration variable ‘papertype’. Alignment
to other paper sizes can be obtained by setting the configuration
-variables 'paperwidth' and 'paperheight'.
+variables ‘paperwidth’ and ‘paperheight’.
These additional configuration variables normally do not require
adjustment:
@@ -445,7 +449,7 @@ asygl
disabled with the functions
warn(string s);
nowarn(string s);
-or by directly modifying the string array 'settings.suppress', which
+or by directly modifying the string array ‘settings.suppress’, which
lists all disabled warnings.
Configuration variables may also be set or overwritten with a
@@ -455,15 +459,15 @@ asy -psviewer=evince -V venn
Alternatively, system environment versions of the above configuration
variables may be set in the conventional way. The corresponding
environment variable name is obtained by converting the configuration
-variable name to upper case and prepending 'ASYMPTOTE_': for example, to
+variable name to upper case and prepending ‘ASYMPTOTE_’: for example, to
set the environment variable
ASYMPTOTE_PAPERTYPE="a4";
-under 'Microsoft Windows XP':
- 1. Click on the 'Start' button;
- 2. Right-click on 'My Computer';
- 3. Choose 'View system information';
- 4. Click the 'Advanced' tab;
- 5. Click the 'Environment Variables' button.
+under ‘Microsoft Windows XP’:
+ 1. Click on the ‘Start’ button;
+ 2. Right-click on ‘My Computer’;
+ 3. Choose ‘View system information’;
+ 4. Click the ‘Advanced’ tab;
+ 5. Click the ‘Environment Variables’ button.

File: asymptote.info, Node: Search paths, Next: Compiling from UNIX source, Prev: Configuring, Up: Installation
@@ -471,22 +475,22 @@ File: asymptote.info, Node: Search paths, Next: Compiling from UNIX source, P
2.5 Search paths
================
-In looking for 'Asymptote' files, 'asy' will search the following paths,
+In looking for ‘Asymptote’ files, ‘asy’ will search the following paths,
in the order listed:
1. The current directory;
2. A list of one or more directories specified by the configuration
- variable 'dir' or environment variable 'ASYMPTOTE_DIR' (separated
- by ':' under UNIX and ';' under 'MSDOS');
+ variable ‘dir’ or environment variable ‘ASYMPTOTE_DIR’ (separated
+ by ‘:’ under UNIX and ‘;’ under ‘MSDOS’);
3. The directory specified by the environment variable
- 'ASYMPTOTE_HOME'; if this variable is not set, the directory '.asy'
- in the user's home directory ('%USERPROFILE%\.asy' under 'MSDOS')
+ ‘ASYMPTOTE_HOME’; if this variable is not set, the directory ‘.asy’
+ in the user’s home directory (‘%USERPROFILE%\.asy’ under ‘MSDOS’)
is used;
- 4. The 'Asymptote' system directory (by default,
- '/usr/local/share/asymptote' under 'UNIX' and 'C:\Program
- Files\Asymptote' under 'MSDOS').
- 5. The 'Asymptote' examples directory (by default,
- '/usr/local/share/doc/asymptote/examples' under 'UNIX' and
- 'C:\Program Files\Asymptote\examples' under 'MSDOS').
+ 4. The ‘Asymptote’ system directory (by default,
+ ‘/usr/local/share/asymptote’ under ‘UNIX’ and ‘C:\Program
+ Files\Asymptote’ under ‘MSDOS’).
+ 5. The ‘Asymptote’ examples directory (by default,
+ ‘/usr/local/share/doc/asymptote/examples’ under ‘UNIX’ and
+ ‘C:\Program Files\Asymptote\examples’ under ‘MSDOS’).

File: asymptote.info, Node: Compiling from UNIX source, Next: Editing modes, Prev: Search paths, Up: Installation
@@ -494,8 +498,8 @@ File: asymptote.info, Node: Compiling from UNIX source, Next: Editing modes,
2.6 Compiling from UNIX source
==============================
-To compile and install a 'UNIX' executable from the source release
-'asymptote-x.xx.src.tgz' in the subdirectory 'x.xx' under
+To compile and install a ‘UNIX’ executable from the source release
+‘asymptote-x.xx.src.tgz’ in the subdirectory ‘x.xx’ under
<https://sourceforge.net/projects/asymptote/files/>
@@ -507,10 +511,10 @@ cd asymptote-x.xx
used; if it is old we recommend first putting
<https://github.com/ivmai/bdwgc/releases/download/v8.0.4/gc-8.0.4.tar.gz>
<https://www.ivmaisoft.com/_bin/atomic_ops/libatomic_ops-7.6.10.tar.gz>
-in the 'Asymptote' source directory.
+in the ‘Asymptote’ source directory.
- On 'UNIX' platforms (other than 'MacOS X'), we recommend using
-version '3.2.1' of the 'freeglut' library. To compile 'freeglut',
+ On ‘UNIX’ platforms (other than ‘MacOS X’), we recommend using
+version ‘3.2.1’ of the ‘freeglut’ library. To compile ‘freeglut’,
download
<https://prdownloads.sourceforge.net/freeglut/freeglut-3.2.1.tar.gz>
and type (as the root user):
@@ -521,44 +525,44 @@ cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_C_FLAGS=-fcommon .
make
make install
- Then compile 'Asymptote' with the commands
+ Then compile ‘Asymptote’ with the commands
./configure
make all
make install
-Be sure to use GNU 'make' (on non-GNU systems this command may be called
-'gmake'). To build the documentation, you may need to install the
-'texinfo-tex' package. If you get errors from a broken 'texinfo' or
-'pdftex' installation, simply put
+Be sure to use GNU ‘make’ (on non-GNU systems this command may be called
+‘gmake’). To build the documentation, you may need to install the
+‘texinfo-tex’ package. If you get errors from a broken ‘texinfo’ or
+‘pdftex’ installation, simply put
<https://asymptote.sourceforge.io/asymptote.pdf>
-in the directory 'doc' and repeat the command 'make all'.
+in the directory ‘doc’ and repeat the command ‘make all’.
For a (default) system-wide installation, the last command should be
done as the root user. To install without root privileges, change the
-'./configure' command to
+‘./configure’ command to
./configure --prefix=$HOME/asymptote
One can disable use of the Boehm garbage collector by configuring
-with './configure --disable-gc'. For a list of other configuration
-options, say './configure --help'. For example, under 'MacOS X', one
-can tell configure to use the 'clang' compilers and look for header
+with ‘./configure --disable-gc’. For a list of other configuration
+options, say ‘./configure --help’. For example, under ‘MacOS X’, one
+can tell configure to use the ‘clang’ compilers and look for header
files and libraries in nonstandard locations:
./configure CC=clang CXX=clang++ CPPFLAGS=-I/opt/local/include LDFLAGS=-L/opt/local/lib
- If you are compiling 'Asymptote' with 'gcc', you will need a
+ If you are compiling ‘Asymptote’ with ‘gcc’, you will need a
relatively recent version (e.g. 3.4.4 or later). For full interactive
-functionality, you will need version 4.3 or later of the GNU 'readline'
-library. The file 'gcc3.3.2curses.patch' in the 'patches' directory can
+functionality, you will need version 4.3 or later of the GNU ‘readline’
+library. The file ‘gcc3.3.2curses.patch’ in the ‘patches’ directory can
be used to patch the broken curses.h header file (or a local copy
-thereof in the current directory) on some 'AIX' and 'IRIX' systems.
+thereof in the current directory) on some ‘AIX’ and ‘IRIX’ systems.
- The 'FFTW' library is only required if you want 'Asymptote' to be
+ The ‘FFTW’ library is only required if you want ‘Asymptote’ to be
able to take Fourier transforms of data (say, to compute an audio power
-spectrum). The 'GSL' library is only required if you require the
+spectrum). The ‘GSL’ library is only required if you require the
special functions that it supports.
- If you don't want to install 'Asymptote' system wide, just make sure
-the compiled binary 'asy' and GUI script 'xasy' are in your path and set
-the configuration variable 'dir' to point to the directory 'base' (in
-the top level directory of the 'Asymptote' source code).
+ If you don’t want to install ‘Asymptote’ system wide, just make sure
+the compiled binary ‘asy’ and GUI script ‘xasy’ are in your path and set
+the configuration variable ‘dir’ to point to the directory ‘base’ (in
+the top level directory of the ‘Asymptote’ source code).

File: asymptote.info, Node: Editing modes, Next: Git, Prev: Compiling from UNIX source, Up: Installation
@@ -566,52 +570,52 @@ File: asymptote.info, Node: Editing modes, Next: Git, Prev: Compiling from UN
2.7 Editing modes
=================
-Users of 'emacs' can edit 'Asymptote' code with the mode 'asy-mode',
-after enabling it by putting the following lines in their '.emacs'
-initialization file, replacing 'ASYDIR' with the location of the
-'Asymptote' system directory (by default, '/usr/local/share/asymptote'
-or 'C:\Program Files\Asymptote' under 'MSDOS'):
+Users of ‘emacs’ can edit ‘Asymptote’ code with the mode ‘asy-mode’,
+after enabling it by putting the following lines in their ‘.emacs’
+initialization file, replacing ‘ASYDIR’ with the location of the
+‘Asymptote’ system directory (by default, ‘/usr/local/share/asymptote’
+or ‘C:\Program Files\Asymptote’ under ‘MSDOS’):
(add-to-list 'load-path "ASYDIR")
(autoload 'asy-mode "asy-mode.el" "Asymptote major mode." t)
(autoload 'lasy-mode "asy-mode.el" "hybrid Asymptote/Latex major mode." t)
(autoload 'asy-insinuate-latex "asy-mode.el" "Asymptote insinuate LaTeX." t)
(add-to-list 'auto-mode-alist '("\\.asy$" . asy-mode))
-Particularly useful key bindings in this mode are 'C-c C-c', which
-compiles and displays the current buffer, and the key binding 'C-c ?',
+Particularly useful key bindings in this mode are ‘C-c C-c’, which
+compiles and displays the current buffer, and the key binding ‘C-c ?’,
which shows the available function prototypes for the command at the
cursor. For full functionality you should also install the Apache
-Software Foundation package 'two-mode-mode':
+Software Foundation package ‘two-mode-mode’:
<https://www.dedasys.com/freesoftware/files/two-mode-mode.el>
-Once installed, you can use the hybrid mode 'lasy-mode' to edit a LaTeX
-file containing embedded 'Asymptote' code (*note LaTeX usage::). This
-mode can be enabled within 'latex-mode' with the key sequence 'M-x
-lasy-mode <RET>'. On 'UNIX' systems, additional keywords will be
-generated from all 'asy' files in the space-separated list of
-directories specified by the environment variable 'ASYMPTOTE_SITEDIR'.
-Further documentation of 'asy-mode' is available within 'emacs' by
-pressing the sequence keys 'C-h f asy-mode <RET>'.
+Once installed, you can use the hybrid mode ‘lasy-mode’ to edit a LaTeX
+file containing embedded ‘Asymptote’ code (*note LaTeX usage::). This
+mode can be enabled within ‘latex-mode’ with the key sequence ‘M-x
+lasy-mode <RET>’. On ‘UNIX’ systems, additional keywords will be
+generated from all ‘asy’ files in the space-separated list of
+directories specified by the environment variable ‘ASYMPTOTE_SITEDIR’.
+Further documentation of ‘asy-mode’ is available within ‘emacs’ by
+pressing the sequence keys ‘C-h f asy-mode <RET>’.
- Fans of 'vim' can customize 'vim' for 'Asymptote' with
+ Fans of ‘vim’ can customize ‘vim’ for ‘Asymptote’ with
-'cp /usr/local/share/asymptote/asy.vim ~/.vim/syntax/asy.vim'
+‘cp /usr/local/share/asymptote/asy.vim ~/.vim/syntax/asy.vim’
-and add the following to their '~/.vimrc' file:
+and add the following to their ‘~/.vimrc’ file:
augroup filetypedetect
au BufNewFile,BufRead *.asy setf asy
augroup END
filetype plugin on
- If any of these directories or files don't exist, just create them.
-To set 'vim' up to run the current asymptote script using ':make' just
-add to '~/.vim/ftplugin/asy.vim':
+ If any of these directories or files don’t exist, just create them.
+To set ‘vim’ up to run the current asymptote script using ‘:make’ just
+add to ‘~/.vim/ftplugin/asy.vim’:
setlocal makeprg=asy\ %
setlocal errorformat=%f:\ %l.%c:\ %m
- Syntax highlighting support for the KDE editor 'Kate' can be enabled
-by running 'asy-kate.sh' in the '/usr/local/share/asymptote' directory
-and putting the generated 'asymptote.xml' file in
-'~/.local/share/org.kde.syntax-highlighting/syntax/'.
+ Syntax highlighting support for the KDE editor ‘Kate’ can be enabled
+by running ‘asy-kate.sh’ in the ‘/usr/local/share/asymptote’ directory
+and putting the generated ‘asymptote.xml’ file in
+‘~/.local/share/org.kde.syntax-highlighting/syntax/’.

File: asymptote.info, Node: Git, Next: Uninstall, Prev: Editing modes, Up: Installation
@@ -620,7 +624,7 @@ File: asymptote.info, Node: Git, Next: Uninstall, Prev: Editing modes, Up: I
=======
The following commands are needed to install the latest development
-version of 'Asymptote' using 'git':
+version of ‘Asymptote’ using ‘git’:
git clone https://github.com/vectorgraphics/asymptote
cd asymptote
@@ -629,8 +633,8 @@ cd asymptote
make all
make install
-To compile without optimization, use the command 'make CFLAGS=-g'. On
-'Ubuntu' systems, you may need to first install the required
+To compile without optimization, use the command ‘make CFLAGS=-g’. On
+‘Ubuntu’ systems, you may need to first install the required
dependencies:
apt-get build-dep asymptote
@@ -640,11 +644,11 @@ File: asymptote.info, Node: Uninstall, Prev: Git, Up: Installation
2.9 Uninstall
=============
-To uninstall a 'Linux x86_64' binary distribution, use the commands
+To uninstall a ‘Linux x86_64’ binary distribution, use the commands
tar -zxvf asymptote-x.xx.x86_64.tgz | xargs --replace=% rm /%
texhash
-To uninstall all 'Asymptote' files installed from a source distribution,
+To uninstall all ‘Asymptote’ files installed from a source distribution,
use the command
make uninstall
@@ -656,19 +660,19 @@ File: asymptote.info, Node: Tutorial, Next: Drawing commands, Prev: Installat
* Menu:
-* Drawing in batch mode:: Run 'Asymptote' on a text file
-* Drawing in interactive mode:: Running 'Asymptote' interactively
+* Drawing in batch mode:: Run ‘Asymptote’ on a text file
+* Drawing in interactive mode:: Running ‘Asymptote’ interactively
* Figure size:: Specifying the figure size
-* Labels:: Adding 'LaTeX' labels
+* Labels:: Adding ‘LaTeX’ labels
* Paths:: Drawing lines and curves
-A concise introduction to 'Asymptote' is given here. For a more
-thorough introduction, see the excellent 'Asymptote' tutorial written by
+A concise introduction to ‘Asymptote’ is given here. For a more
+thorough introduction, see the excellent ‘Asymptote’ tutorial written by
Charles Staats:
<https://asymptote.sourceforge.io/asymptote_tutorial.pdf>
- Another 'Asymptote' tutorial is available as a wiki, with images
+ Another ‘Asymptote’ tutorial is available as a wiki, with images
rendered by an online Asymptote engine:
<https://www.artofproblemsolving.com/wiki/?title=Asymptote_(Vector_Graphics_Language)>
@@ -680,23 +684,23 @@ File: asymptote.info, Node: Drawing in batch mode, Next: Drawing in interactiv
=========================
To draw a line from coordinate (0,0) to coordinate (100,100), create a
-text file 'test.asy' containing
+text file ‘test.asy’ containing
draw((0,0)--(100,100));
Then execute the command
asy -V test
-Alternatively, 'MSDOS' users can drag and drop 'test.asy' onto the
-Desktop 'asy' icon (or make 'Asymptote' the default application for the
-extension 'asy').
+Alternatively, ‘MSDOS’ users can drag and drop ‘test.asy’ onto the
+Desktop ‘asy’ icon (or make ‘Asymptote’ the default application for the
+extension ‘asy’).
-This method, known as _batch mode_, outputs a 'PostScript' file
-'test.eps'. If you prefer PDF output, use the command line
+This method, known as _batch mode_, outputs a ‘PostScript’ file
+‘test.eps’. If you prefer PDF output, use the command line
asy -V -f pdf test
- In either case, the '-V' option opens up a viewer window so you can
+ In either case, the ‘-V’ option opens up a viewer window so you can
immediately view the result:
[./diagonal]
-Here, the '--' connector joins the two points '(0,0)' and '(100,100)'
+Here, the ‘--’ connector joins the two points ‘(0,0)’ and ‘(100,100)’
with a line segment.

@@ -705,17 +709,17 @@ File: asymptote.info, Node: Drawing in interactive mode, Next: Figure size, P
3.2 Drawing in interactive mode
===============================
-Another method is _interactive mode_, where 'Asymptote' reads individual
+Another method is _interactive mode_, where ‘Asymptote’ reads individual
commands as they are entered by the user. To try this out, enter
-'Asymptote''s interactive mode by clicking on the 'Asymptote' icon or
-typing the command 'asy'. Then type
+‘Asymptote’’s interactive mode by clicking on the ‘Asymptote’ icon or
+typing the command ‘asy’. Then type
draw((0,0)--(100,100));
-followed by 'Enter', to obtain the above image. At this point you can
-type further 'draw' commands, which will be added to the displayed
-figure, 'erase' to clear the canvas,
+followed by ‘Enter’, to obtain the above image. At this point you can
+type further ‘draw’ commands, which will be added to the displayed
+figure, ‘erase’ to clear the canvas,
input test;
-to execute all of the commands contained in the file 'test.asy', or
-'quit' to exit interactive mode. You can use the arrow keys in
+to execute all of the commands contained in the file ‘test.asy’, or
+‘quit’ to exit interactive mode. You can use the arrow keys in
interactive mode to edit previous lines. The tab key will automatically
complete unambiguous words; otherwise, hitting tab again will show the
possible choices. Further commands specific to interactive mode are
@@ -727,20 +731,20 @@ File: asymptote.info, Node: Figure size, Next: Labels, Prev: Drawing in inter
3.3 Figure size
===============
-In 'Asymptote', coordinates like '(0,0)' and '(100,100)', called
-_pairs_, are expressed in 'PostScript' "big points" (1 'bp' = 1/72
-'inch') and the default line width is '0.5bp'. However, it is often
-inconvenient to work directly in 'PostScript' coordinates. The next
+In ‘Asymptote’, coordinates like ‘(0,0)’ and ‘(100,100)’, called
+_pairs_, are expressed in ‘PostScript’ "big points" (1 ‘bp’ = 1/72
+‘inch’) and the default line width is ‘0.5bp’. However, it is often
+inconvenient to work directly in ‘PostScript’ coordinates. The next
example produces identical output to the previous example, by scaling
-the line '(0,0)--(1,1)' to fit a rectangle of width '100.5 bp' and
-height '100.5 bp' (the extra '0.5bp' accounts for the line width):
+the line ‘(0,0)--(1,1)’ to fit a rectangle of width ‘100.5 bp’ and
+height ‘100.5 bp’ (the extra ‘0.5bp’ accounts for the line width):
size(100.5,100.5);
draw((0,0)--(1,1));
[./diagonal]
- One can also specify the size in 'pt' (1 'pt' = 1/72.27 'inch'),
-'cm', 'mm', or 'inches'. Two nonzero size arguments (or a single size
+ One can also specify the size in ‘pt’ (1 ‘pt’ = 1/72.27 ‘inch’),
+‘cm’, ‘mm’, or ‘inches’. Two nonzero size arguments (or a single size
argument) restrict the size in both directions, preserving the aspect
ratio. If 0 is given as a size argument, no restriction is made in that
direction; the overall scaling will be determined by the other direction
@@ -750,17 +754,17 @@ draw((0,0)--(2,1),Arrow);
[./bigdiagonal]
- To connect several points and create a cyclic path, use the 'cycle'
+ To connect several points and create a cyclic path, use the ‘cycle’
keyword:
size(3cm);
draw((0,0)--(1,0)--(1,1)--(0,1)--cycle);
[./square]
-For convenience, the path '(0,0)--(1,0)--(1,1)--(0,1)--cycle' may be
-replaced with the predefined variable 'unitsquare', or equivalently,
-'box((0,0),(1,1))'.
+For convenience, the path ‘(0,0)--(1,0)--(1,1)--(0,1)--cycle’ may be
+replaced with the predefined variable ‘unitsquare’, or equivalently,
+‘box((0,0),(1,1))’.
- To make the user coordinates represent multiples of exactly '1cm':
+ To make the user coordinates represent multiples of exactly ‘1cm’:
unitsize(1cm);
draw(unitsquare);
@@ -770,8 +774,8 @@ File: asymptote.info, Node: Labels, Next: Paths, Prev: Figure size, Up: Tuto
3.4 Labels
==========
-Adding labels is easy in 'Asymptote'; one specifies the label as a
-double-quoted 'LaTeX' string, a coordinate, and an optional alignment
+Adding labels is easy in ‘Asymptote’; one specifies the label as a
+double-quoted ‘LaTeX’ string, a coordinate, and an optional alignment
direction:
size(3cm);
draw(unitsquare);
@@ -782,12 +786,12 @@ label("$D$",(0,1),NW);
[./labelsquare]
- 'Asymptote' uses the standard compass directions 'E=(1,0)',
-'N=(0,1)', 'NE=unit(N+E)', and 'ENE=unit(E+NE)', etc., which along with
-the directions 'up', 'down', 'right', and 'left' are defined as pairs in
-the 'Asymptote' base module 'plain' (a user who has a local variable
-named 'E' may access the compass direction 'E' by prefixing it with the
-name of the module where it is defined: 'plain.E').
+ ‘Asymptote’ uses the standard compass directions ‘E=(1,0)’,
+‘N=(0,1)’, ‘NE=unit(N+E)’, and ‘ENE=unit(E+NE)’, etc., which along with
+the directions ‘up’, ‘down’, ‘right’, and ‘left’ are defined as pairs in
+the ‘Asymptote’ base module ‘plain’ (a user who has a local variable
+named ‘E’ may access the compass direction ‘E’ by prefixing it with the
+name of the module where it is defined: ‘plain.E’).

File: asymptote.info, Node: Paths, Prev: Labels, Up: Tutorial
@@ -801,23 +805,23 @@ size(100,0);
draw((1,0){up}..{left}(0,1),Arrow);
[./quartercircle]
-Here the directions 'up' and 'left' in braces specify the outgoing and
-incoming directions at the points '(1,0)' and '(0,1)', respectively.
+Here the directions ‘up’ and ‘left’ in braces specify the outgoing and
+incoming directions at the points ‘(1,0)’ and ‘(0,1)’, respectively.
In general, a path is specified as a list of points (or other paths)
-interconnected with '--', which denotes a straight line segment, or
-'..', which denotes a cubic spline (*note Bezier curves::). Specifying
-a final '..cycle' creates a cyclic path that connects smoothly back to
+interconnected with ‘--’, which denotes a straight line segment, or
+‘..’, which denotes a cubic spline (*note Bezier curves::). Specifying
+a final ‘..cycle’ creates a cyclic path that connects smoothly back to
the initial node, as in this approximation (accurate to within 0.06%) of
a unit circle:
path unitcircle=E..N..W..S..cycle;
-An 'Asymptote' path, being connected, is equivalent to a 'PostScript
-subpath'. The '^^' binary operator, which requests that the pen be
+An ‘Asymptote’ path, being connected, is equivalent to a ‘PostScript
+subpath’. The ‘^^’ binary operator, which requests that the pen be
moved (without drawing or affecting endpoint curvatures) from the final
point of the left-hand path to the initial point of the right-hand path,
-may be used to group several 'Asymptote' paths into a 'path[]' array
-(equivalent to a 'PostScript' path):
+may be used to group several ‘Asymptote’ paths into a ‘path[]’ array
+(equivalent to a ‘PostScript’ path):
size(0,100);
path unitcircle=E..N..W..S..cycle;
path g=scale(2)*unitcircle;
@@ -826,15 +830,15 @@ filldraw(unitcircle^^g,evenodd+yellow,black);
[./superpath]
-The 'PostScript' even-odd fill rule here specifies that only the region
+The ‘PostScript’ even-odd fill rule here specifies that only the region
bounded between the two unit circles is filled (*note fillrule::). In
this example, the same effect can be achieved by using the default zero
winding number fill rule, if one is careful to alternate the orientation
of the paths:
filldraw(unitcircle^^reverse(g),yellow,black);
- The '^^' operator is used by the 'box(triple, triple)' function in
-the module 'three' to construct the edges of a cube 'unitbox' without
+ The ‘^^’ operator is used by the ‘box(triple, triple)’ function in
+the module ‘three’ to construct the edges of a cube ‘unitbox’ without
retracing steps (*note three::):
import three;
@@ -854,7 +858,7 @@ label("(0,0,1)",(0,0,1),Z);
[./cube]
- See section *note graph:: (or the online 'Asymptote' gallery and
+ See section *note graph:: (or the online ‘Asymptote’ gallery and
external links posted at <https://asymptote.sourceforge.io>) for further
examples, including two-dimensional and interactive three-dimensional
scientific graphs. Additional examples have been posted by Philippe
@@ -867,25 +871,25 @@ File: asymptote.info, Node: Drawing commands, Next: Bezier curves, Prev: Tuto
4 Drawing commands
******************
-All of 'Asymptote''s graphical capabilities are based on four primitive
-commands. The three 'PostScript' drawing commands 'draw', 'fill', and
-'clip' add objects to a picture in the order in which they are executed,
+All of ‘Asymptote’’s graphical capabilities are based on four primitive
+commands. The three ‘PostScript’ drawing commands ‘draw’, ‘fill’, and
+‘clip’ add objects to a picture in the order in which they are executed,
with the most recently drawn object appearing on top. The labeling
-command 'label' can be used to add text labels and external EPS images,
-which will appear on top of the 'PostScript' objects (since this is
+command ‘label’ can be used to add text labels and external EPS images,
+which will appear on top of the ‘PostScript’ objects (since this is
normally what one wants), but again in the relative order in which they
were executed. After drawing objects on a picture, the picture can be
-output with the 'shipout' function (*note shipout::).
+output with the ‘shipout’ function (*note shipout::).
- If you wish to draw 'PostScript' objects on top of labels (or
-verbatim 'tex' commands; *note tex::), the 'layer' command may be used
-to start a new 'PostScript/LaTeX' layer:
+ If you wish to draw ‘PostScript’ objects on top of labels (or
+verbatim ‘tex’ commands; *note tex::), the ‘layer’ command may be used
+to start a new ‘PostScript/LaTeX’ layer:
void layer(picture pic=currentpicture);
- The 'layer' function gives one full control over the order in which
+ The ‘layer’ function gives one full control over the order in which
objects are drawn. Layers are drawn sequentially, with the most recent
layer appearing on top. Within each layer, labels, images, and verbatim
-'tex' commands are always drawn after the 'PostScript' objects in that
+‘tex’ commands are always drawn after the ‘PostScript’ objects in that
layer.
A page break can be generated with the command
@@ -913,60 +917,60 @@ void draw(picture pic=currentpicture, Label L="", path g,
arrowbar arrow=None, arrowbar bar=None, margin margin=NoMargin,
Label legend="", marker marker=nomarker);
- Draw the path 'g' on the picture 'pic' using pen 'p' for drawing,
-with optional drawing attributes (Label 'L', explicit label alignment
-'align', arrows and bars 'arrow' and 'bar', margins 'margin', legend,
-and markers 'marker'). Only one parameter, the path, is required. For
-convenience, the arguments 'arrow' and 'bar' may be specified in either
-order. The argument 'legend' is a Label to use in constructing an
+ Draw the path ‘g’ on the picture ‘pic’ using pen ‘p’ for drawing,
+with optional drawing attributes (Label ‘L’, explicit label alignment
+‘align’, arrows and bars ‘arrow’ and ‘bar’, margins ‘margin’, legend,
+and markers ‘marker’). Only one parameter, the path, is required. For
+convenience, the arguments ‘arrow’ and ‘bar’ may be specified in either
+order. The argument ‘legend’ is a Label to use in constructing an
optional legend entry.
Bars are useful for indicating dimensions. The possible values of
-'bar' are 'None', 'BeginBar', 'EndBar' (or equivalently 'Bar'), and
-'Bars' (which draws a bar at both ends of the path). Each of these bar
-specifiers (except for 'None') will accept an optional real argument
-that denotes the length of the bar in 'PostScript' coordinates. The
-default bar length is 'barsize(pen)'.
-
- The possible values of 'arrow' are 'None', 'Blank' (which draws no
-arrows or path), 'BeginArrow', 'MidArrow', 'EndArrow' (or equivalently
-'Arrow'), and 'Arrows' (which draws an arrow at both ends of the path).
-All of the arrow specifiers except for 'None' and 'Blank' may be given
-the optional arguments arrowhead 'arrowhead' (one of the predefined
-arrowhead styles 'DefaultHead', 'SimpleHead', 'HookHead', 'TeXHead'),
-real 'size' (arrowhead size in 'PostScript' coordinates), real 'angle'
-(arrowhead angle in degrees), filltype 'filltype' (one of 'FillDraw',
-'Fill', 'NoFill', 'UnFill', 'Draw') and (except for 'MidArrow' and
-'Arrows') a real 'position' (in the sense of 'point(path p, real t)')
+‘bar’ are ‘None’, ‘BeginBar’, ‘EndBar’ (or equivalently ‘Bar’), and
+‘Bars’ (which draws a bar at both ends of the path). Each of these bar
+specifiers (except for ‘None’) will accept an optional real argument
+that denotes the length of the bar in ‘PostScript’ coordinates. The
+default bar length is ‘barsize(pen)’.
+
+ The possible values of ‘arrow’ are ‘None’, ‘Blank’ (which draws no
+arrows or path), ‘BeginArrow’, ‘MidArrow’, ‘EndArrow’ (or equivalently
+‘Arrow’), and ‘Arrows’ (which draws an arrow at both ends of the path).
+All of the arrow specifiers except for ‘None’ and ‘Blank’ may be given
+the optional arguments arrowhead ‘arrowhead’ (one of the predefined
+arrowhead styles ‘DefaultHead’, ‘SimpleHead’, ‘HookHead’, ‘TeXHead’),
+real ‘size’ (arrowhead size in ‘PostScript’ coordinates), real ‘angle’
+(arrowhead angle in degrees), filltype ‘filltype’ (one of ‘FillDraw’,
+‘Fill’, ‘NoFill’, ‘UnFill’, ‘Draw’) and (except for ‘MidArrow’ and
+‘Arrows’) a real ‘position’ (in the sense of ‘point(path p, real t)’)
along the path where the tip of the arrow should be placed. The default
-arrowhead size when drawn with a pen 'p' is 'arrowsize(p)'. There are
-also arrow versions with slightly modified default values of 'size' and
-'angle' suitable for curved arrows: 'BeginArcArrow', 'EndArcArrow' (or
-equivalently 'ArcArrow'), 'MidArcArrow', and 'ArcArrows'.
+arrowhead size when drawn with a pen ‘p’ is ‘arrowsize(p)’. There are
+also arrow versions with slightly modified default values of ‘size’ and
+‘angle’ suitable for curved arrows: ‘BeginArcArrow’, ‘EndArcArrow’ (or
+equivalently ‘ArcArrow’), ‘MidArcArrow’, and ‘ArcArrows’.
Margins can be used to shrink the visible portion of a path by
-'labelmargin(p)' to avoid overlap with other drawn objects. Typical
-values of 'margin' are 'NoMargin', 'BeginMargin', 'EndMargin' (or
-equivalently 'Margin'), and 'Margins' (which leaves a margin at both
-ends of the path). One may use 'Margin(real begin, real end=begin)' to
+‘labelmargin(p)’ to avoid overlap with other drawn objects. Typical
+values of ‘margin’ are ‘NoMargin’, ‘BeginMargin’, ‘EndMargin’ (or
+equivalently ‘Margin’), and ‘Margins’ (which leaves a margin at both
+ends of the path). One may use ‘Margin(real begin, real end=begin)’ to
specify the size of the beginning and ending margin, respectively, in
-multiples of the units 'labelmargin(p)' used for aligning labels.
-Alternatively, 'BeginPenMargin', 'EndPenMargin' (or equivalently
-'PenMargin'), 'PenMargins', 'PenMargin(real begin, real end=begin)'
+multiples of the units ‘labelmargin(p)’ used for aligning labels.
+Alternatively, ‘BeginPenMargin’, ‘EndPenMargin’ (or equivalently
+‘PenMargin’), ‘PenMargins’, ‘PenMargin(real begin, real end=begin)’
specify a margin in units of the pen line width, taking account of the
pen line width when drawing the path or arrow. For example, use
-'DotMargin', an abbreviation for
-'PenMargin(-0.5*dotfactor,0.5*dotfactor)', to draw from the usual
+‘DotMargin’, an abbreviation for
+‘PenMargin(-0.5*dotfactor,0.5*dotfactor)’, to draw from the usual
beginning point just up to the boundary of an end dot of width
-'dotfactor*linewidth(p)'. The qualifiers 'BeginDotMargin',
-'EndDotMargin', and 'DotMargins' work similarly. The qualifier
-'TrueMargin(real begin, real end=begin)' allows one to specify a margin
-directly in 'PostScript' units, independent of the pen line width.
+‘dotfactor*linewidth(p)’. The qualifiers ‘BeginDotMargin’,
+‘EndDotMargin’, and ‘DotMargins’ work similarly. The qualifier
+‘TrueMargin(real begin, real end=begin)’ allows one to specify a margin
+directly in ‘PostScript’ units, independent of the pen line width.
The use of arrows, bars, and margins is illustrated by the examples
-'Pythagoras.asy' and 'sqrtx01.asy'.
+‘Pythagoras.asy’ and ‘sqrtx01.asy’.
- The legend for a picture 'pic' can be fit and aligned to a frame with
+ The legend for a picture ‘pic’ can be fit and aligned to a frame with
the routine:
frame legend(picture pic=currentpicture, int perline=1,
real xmargin=legendmargin, real ymargin=xmargin,
@@ -974,22 +978,22 @@ frame legend(picture pic=currentpicture, int perline=1,
real hskip=legendhskip, real vskip=legendvskip,
real maxwidth=0, real maxheight=0,
bool hstretch=false, bool vstretch=false, pen p=currentpen);
-Here 'xmargin' and 'ymargin' specify the surrounding x and y margins,
-'perline' specifies the number of entries per line (default 1; 0 means
-choose this number automatically), 'linelength' specifies the length of
-the path lines, 'hskip' and 'vskip' specify the line skip (as a multiple
-of the legend entry size), 'maxwidth' and 'maxheight' specify optional
+Here ‘xmargin’ and ‘ymargin’ specify the surrounding x and y margins,
+‘perline’ specifies the number of entries per line (default 1; 0 means
+choose this number automatically), ‘linelength’ specifies the length of
+the path lines, ‘hskip’ and ‘vskip’ specify the line skip (as a multiple
+of the legend entry size), ‘maxwidth’ and ‘maxheight’ specify optional
upper limits on the width and height of the resulting legend (0 means
-unlimited), 'hstretch' and 'vstretch' allow the legend to stretch
-horizontally or vertically, and 'p' specifies the pen used to draw the
+unlimited), ‘hstretch’ and ‘vstretch’ allow the legend to stretch
+horizontally or vertically, and ‘p’ specifies the pen used to draw the
bounding box. The legend frame can then be added and aligned about a
-point on a picture 'dest' using 'add' or 'attach' (*note add about::).
+point on a picture ‘dest’ using ‘add’ or ‘attach’ (*note add about::).
To draw a dot, simply draw a path containing a single point. The
-'dot' command defined in the module 'plain' draws a dot having a
+‘dot’ command defined in the module ‘plain’ draws a dot having a
diameter equal to an explicit pen line width or the default line width
-magnified by 'dotfactor' (6 by default), using the specified filltype
-(*note filltype::) or 'dotfilltype' ('Fill' by default):
+magnified by ‘dotfactor’ (6 by default), using the specified filltype
+(*note filltype::) or ‘dotfilltype’ (‘Fill’ by default):
void dot(frame f, pair z, pen p=currentpen, filltype filltype=dotfilltype);
void dot(picture pic=currentpicture, pair z, pen p=currentpen,
filltype filltype=dotfilltype);
@@ -1003,10 +1007,10 @@ void dot(picture pic=currentpicture, path[] g, pen p=currentpen,
void dot(picture pic=currentpicture, Label L, pen p=currentpen,
filltype filltype=dotfilltype);
- If the variable 'Label' is given as the 'Label' argument to the third
-routine, the 'format' argument will be used to format a string based on
-the dot location (here 'defaultformat' is '"$%.4g$"'). The fourth
-routine draws a dot at every point of a pair array 'z'. One can also
+ If the variable ‘Label’ is given as the ‘Label’ argument to the third
+routine, the ‘format’ argument will be used to format a string based on
+the dot location (here ‘defaultformat’ is ‘"$%.4g$"’). The fourth
+routine draws a dot at every point of a pair array ‘z’. One can also
draw a dot at every node of a path:
void dot(picture pic=currentpicture, Label[] L=new Label[],
explicit path g, align align=RightSide, string format=defaultformat,
@@ -1014,8 +1018,8 @@ void dot(picture pic=currentpicture, Label[] L=new Label[],
See *note pathmarkers:: and *note markers:: for more general methods
for marking path nodes.
- To draw a fixed-sized object (in 'PostScript' coordinates) about the
-user coordinate 'origin', use the routine
+ To draw a fixed-sized object (in ‘PostScript’ coordinates) about the
+user coordinate ‘origin’, use the routine
void draw(pair origin, picture pic=currentpicture, Label L="", path g,
align align=NoAlign, pen p=currentpen, arrowbar arrow=None,
arrowbar bar=None, margin margin=NoMargin, Label legend="",
@@ -1029,18 +1033,18 @@ File: asymptote.info, Node: fill, Next: clip, Prev: draw, Up: Drawing comman
void fill(picture pic=currentpicture, path g, pen p=currentpen);
- Fill the interior region bounded by the cyclic path 'g' on the
-picture 'pic', using the pen 'p'.
+ Fill the interior region bounded by the cyclic path ‘g’ on the
+picture ‘pic’, using the pen ‘p’.
- There is also a convenient 'filldraw' command, which fills the path
+ There is also a convenient ‘filldraw’ command, which fills the path
and then draws in the boundary. One can specify separate pens for each
operation:
void filldraw(picture pic=currentpicture, path g, pen fillpen=currentpen,
pen drawpen=currentpen);
- This fixed-size version of 'fill' allows one to fill an object
-described in 'PostScript' coordinates about the user coordinate
-'origin':
+ This fixed-size version of ‘fill’ allows one to fill an object
+described in ‘PostScript’ coordinates about the user coordinate
+‘origin’:
void fill(pair origin, picture pic=currentpicture, path g, pen p=currentpen);
This is just a convenient abbreviation for the commands:
@@ -1050,64 +1054,64 @@ add(pic,opic,origin);
The routine
void filloutside(picture pic=currentpicture, path g, pen p=currentpen);
-fills the region exterior to the path 'g', out to the current boundary
-of picture 'pic'.
+fills the region exterior to the path ‘g’, out to the current boundary
+of picture ‘pic’.
Lattice gradient shading varying smoothly over a two-dimensional
-array of pens 'p', using fill rule 'fillrule', can be produced with
+array of pens ‘p’, using fill rule ‘fillrule’, can be produced with
void latticeshade(picture pic=currentpicture, path g, bool stroke=false,
pen fillrule=currentpen, pen[][] p)
- If 'stroke=true', the region filled is the same as the region that
-would be drawn by 'draw(pic,g,zerowinding)'; in this case the path 'g'
-need not be cyclic. The pens in 'p' must belong to the same color
-space. One can use the functions 'rgb(pen)' or 'cmyk(pen)' to promote
+ If ‘stroke=true’, the region filled is the same as the region that
+would be drawn by ‘draw(pic,g,zerowinding)’; in this case the path ‘g’
+need not be cyclic. The pens in ‘p’ must belong to the same color
+space. One can use the functions ‘rgb(pen)’ or ‘cmyk(pen)’ to promote
pens to a higher color space, as illustrated in the example file
-'latticeshading.asy'.
+‘latticeshading.asy’.
- Axial gradient shading varying smoothly from 'pena' to 'penb' in the
-direction of the line segment 'a--b' can be achieved with
+ Axial gradient shading varying smoothly from ‘pena’ to ‘penb’ in the
+direction of the line segment ‘a--b’ can be achieved with
void axialshade(picture pic=currentpicture, path g, bool stroke=false,
pen pena, pair a, bool extenda=true,
pen penb, pair b, bool extendb=true);
-The boolean parameters 'extenda' and 'extendb' indicate whether the
-shading should extend beyond the axis endpoints 'a' and 'b'. An example
-of axial shading is provided in the example file 'axialshade.asy'.
+The boolean parameters ‘extenda’ and ‘extendb’ indicate whether the
+shading should extend beyond the axis endpoints ‘a’ and ‘b’. An example
+of axial shading is provided in the example file ‘axialshade.asy’.
- Radial gradient shading varying smoothly from 'pena' on the circle
-with center 'a' and radius 'ra' to 'penb' on the circle with center 'b'
-and radius 'rb' is similar:
+ Radial gradient shading varying smoothly from ‘pena’ on the circle
+with center ‘a’ and radius ‘ra’ to ‘penb’ on the circle with center ‘b’
+and radius ‘rb’ is similar:
void radialshade(picture pic=currentpicture, path g, bool stroke=false,
pen pena, pair a, real ra, bool extenda=true,
pen penb, pair b, real rb, bool extendb=true);
-The boolean parameters 'extenda' and 'extendb' indicate whether the
-shading should extend beyond the radii 'a' and 'b'. Illustrations of
-radial shading are provided in the example files 'shade.asy',
-'ring.asy', and 'shadestroke.asy'.
-
- Gouraud shading using fill rule 'fillrule' and the vertex colors in
-the pen array 'p' on a triangular lattice defined by the vertices 'z'
-and edge flags 'edges' is implemented with
+The boolean parameters ‘extenda’ and ‘extendb’ indicate whether the
+shading should extend beyond the radii ‘a’ and ‘b’. Illustrations of
+radial shading are provided in the example files ‘shade.asy’,
+‘ring.asy’, and ‘shadestroke.asy’.
+
+ Gouraud shading using fill rule ‘fillrule’ and the vertex colors in
+the pen array ‘p’ on a triangular lattice defined by the vertices ‘z’
+and edge flags ‘edges’ is implemented with
void gouraudshade(picture pic=currentpicture, path g, bool stroke=false,
pen fillrule=currentpen, pen[] p, pair[] z,
int[] edges);
void gouraudshade(picture pic=currentpicture, path g, bool stroke=false,
pen fillrule=currentpen, pen[] p, int[] edges);
-In the second form, the elements of 'z' are taken to be successive nodes
-of path 'g'. The pens in 'p' must belong to the same color space.
+In the second form, the elements of ‘z’ are taken to be successive nodes
+of path ‘g’. The pens in ‘p’ must belong to the same color space.
Illustrations of Gouraud shading are provided in the example file
-'Gouraud.asy'. The edge flags used in Gouraud shading are documented
+‘Gouraud.asy’. The edge flags used in Gouraud shading are documented
here:
<https://www.adobe.com/content/dam/acom/en/devnet/postscript/pdfs/TN5600.SmoothShading.pdf>
- Tensor product shading using clipping path 'g', fill rule 'fillrule'
-on patches bounded by the n cyclic paths of length 4 in path array 'b',
-using the vertex colors specified in the n \times 4 pen array 'p' and
-internal control points in the n \times 4 array 'z', is implemented with
+ Tensor product shading using clipping path ‘g’, fill rule ‘fillrule’
+on patches bounded by the n cyclic paths of length 4 in path array ‘b’,
+using the vertex colors specified in the n \times 4 pen array ‘p’ and
+internal control points in the n \times 4 array ‘z’, is implemented with
void tensorshade(picture pic=currentpicture, path[] g, bool stroke=false,
pen fillrule=currentpen, pen[][] p, path[] b=g,
pair[][] z=new pair[][]);
-If the array 'z' is empty, Coons shading, in which the color control
-points are calculated automatically, is used. The pens in 'p' must
+If the array ‘z’ is empty, Coons shading, in which the color control
+points are calculated automatically, is used. The pens in ‘p’ must
belong to the same color space. A simpler interface for the case of a
single patch (n=1) is also available:
void tensorshade(picture pic=currentpicture, path g, bool stroke=false,
@@ -1118,20 +1122,20 @@ a sequence using a given array of pens:
void draw(picture pic=currentpicture, pen fillrule=currentpen, path[] g,
pen[] p);
Illustrations of tensor product and Coons shading are provided in the
-example files 'tensor.asy', 'Coons.asy', 'BezierPatch.asy', and
-'rainbow.asy'.
+example files ‘tensor.asy’, ‘Coons.asy’, ‘BezierPatch.asy’, and
+‘rainbow.asy’.
More general shading possibilities are available using TeX engines
that produce PDF output (*note texengines::): the routine
void functionshade(picture pic=currentpicture, path[] g, bool stroke=false,
pen fillrule=currentpen, string shader);
-shades on picture 'pic' the interior of path 'g' according to fill rule
-'fillrule' using the 'PostScript' calculator routine specified by the
-string 'shader'; this routine takes 2 arguments, each in [0,1], and
-returns 'colors(fillrule).length' color components. Function shading is
-illustrated in the example 'functionshading.asy'.
+shades on picture ‘pic’ the interior of path ‘g’ according to fill rule
+‘fillrule’ using the ‘PostScript’ calculator routine specified by the
+string ‘shader’; this routine takes 2 arguments, each in [0,1], and
+returns ‘colors(fillrule).length’ color components. Function shading is
+illustrated in the example ‘functionshading.asy’.
- The following routine uses 'evenodd' clipping together with the '^^'
+ The following routine uses ‘evenodd’ clipping together with the ‘^^’
operator to unfill a region:
void unfill(picture pic=currentpicture, path g);
@@ -1145,13 +1149,13 @@ File: asymptote.info, Node: clip, Next: label, Prev: fill, Up: Drawing comma
void clip(picture pic=currentpicture, path g, stroke=false,
pen fillrule=currentpen);
- Clip the current contents of picture 'pic' to the region bounded by
-the path 'g', using fill rule 'fillrule' (*note fillrule::). If
-'stroke=true', the clipped portion is the same as the region that would
-be drawn with 'draw(pic,g,zerowinding)'; in this case the path 'g' need
+ Clip the current contents of picture ‘pic’ to the region bounded by
+the path ‘g’, using fill rule ‘fillrule’ (*note fillrule::). If
+‘stroke=true’, the clipped portion is the same as the region that would
+be drawn with ‘draw(pic,g,zerowinding)’; in this case the path ‘g’ need
not be cyclic. While clipping has no notion of depth (it transcends
layers and even pages), one can localize clipping to a temporary
-picture, which can then be added to 'pic'. For an illustration of
+picture, which can then be added to ‘pic’. For an illustration of
picture clipping, see the first example in *note LaTeX usage::.

@@ -1163,12 +1167,12 @@ File: asymptote.info, Node: label, Prev: clip, Up: Drawing commands
void label(picture pic=currentpicture, Label L, pair position,
align align=NoAlign, pen p=currentpen, filltype filltype=NoFill)
- Draw Label 'L' on picture 'pic' using pen 'p'. If 'align' is
-'NoAlign', the label will be centered at user coordinate 'position';
-otherwise it will be aligned in the direction of 'align' and displaced
-from 'position' by the 'PostScript' offset 'align*labelmargin(p)'. The
-constant 'Align' can be used to align the bottom-left corner of the
-label at 'position'. The Label 'L' can either be a string or the
+ Draw Label ‘L’ on picture ‘pic’ using pen ‘p’. If ‘align’ is
+‘NoAlign’, the label will be centered at user coordinate ‘position’;
+otherwise it will be aligned in the direction of ‘align’ and displaced
+from ‘position’ by the ‘PostScript’ offset ‘align*labelmargin(p)’. The
+constant ‘Align’ can be used to align the bottom-left corner of the
+label at ‘position’. The Label ‘L’ can either be a string or the
structure obtained by calling one of the functions
Label Label(string s="", pair position, align align=NoAlign,
pen p=nullpen, embed embed=Rotate, filltype filltype=NoFill);
@@ -1180,79 +1184,79 @@ Label Label(Label L, align align=NoAlign,
pen p=nullpen, embed embed=L.embed, filltype filltype=NoFill);
The text of a Label can be scaled, slanted, rotated, or shifted by
multiplying it on the left by an affine transform (*note Transforms::).
-For example, 'rotate(45)*xscale(2)*L' first scales 'L' in the x
+For example, ‘rotate(45)*xscale(2)*L’ first scales ‘L’ in the x
direction and then rotates it counterclockwise by 45 degrees. The final
-position of a Label can also be shifted by a 'PostScript' coordinate
-translation: 'shift(10,0)*L'. An explicit pen specified within the
-Label overrides other pen arguments. The 'embed' argument determines
+position of a Label can also be shifted by a ‘PostScript’ coordinate
+translation: ‘shift(10,0)*L’. An explicit pen specified within the
+Label overrides other pen arguments. The ‘embed’ argument determines
how the Label should transform with the embedding picture:
-'Shift'
+‘Shift’
only shift with embedding picture;
-'Rotate'
+‘Rotate’
only shift and rotate with embedding picture (default);
-'Rotate(pair z)'
- rotate with (picture-transformed) vector 'z'.
+‘Rotate(pair z)’
+ rotate with (picture-transformed) vector ‘z’.
-'Slant'
+‘Slant’
only shift, rotate, slant, and reflect with embedding picture;
-'Scale'
+‘Scale’
shift, rotate, slant, reflect, and scale with embedding picture.
To add a label to a path, use
void label(picture pic=currentpicture, Label L, path g, align align=NoAlign,
pen p=currentpen, filltype filltype=NoFill);
By default the label will be positioned at the midpoint of the path.
-An alternative label position (in the sense of 'point(path p, real t)')
-may be specified as a real value for 'position' in constructing the
-Label. The position 'Relative(real)' specifies a location relative to
+An alternative label position (in the sense of ‘point(path p, real t)’)
+may be specified as a real value for ‘position’ in constructing the
+Label. The position ‘Relative(real)’ specifies a location relative to
the total arclength of the path. These convenient abbreviations are
predefined:
position BeginPoint=Relative(0);
position MidPoint=Relative(0.5);
position EndPoint=Relative(1);
- Path labels are aligned in the direction 'align', which may be
+ Path labels are aligned in the direction ‘align’, which may be
specified as an absolute compass direction (pair) or a direction
-'Relative(pair)' measured relative to a north axis in the local
-direction of the path. For convenience 'LeftSide', 'Center', and
-'RightSide' are defined as 'Relative(W)', 'Relative((0,0))', and
-'Relative(E)', respectively. Multiplying 'LeftSide' and 'RightSide' on
+‘Relative(pair)’ measured relative to a north axis in the local
+direction of the path. For convenience ‘LeftSide’, ‘Center’, and
+‘RightSide’ are defined as ‘Relative(W)’, ‘Relative((0,0))’, and
+‘Relative(E)’, respectively. Multiplying ‘LeftSide’ and ‘RightSide’ on
the left by a real scaling factor will move the label further away from
or closer to the path.
- A label with a fixed-size arrow of length 'arrowlength' pointing to
-'b' from direction 'dir' can be produced with the routine
+ A label with a fixed-size arrow of length ‘arrowlength’ pointing to
+‘b’ from direction ‘dir’ can be produced with the routine
void arrow(picture pic=currentpicture, Label L="", pair b, pair dir,
real length=arrowlength, align align=NoAlign,
pen p=currentpen, arrowbar arrow=Arrow, margin margin=EndMargin);
If no alignment is specified (either in the Label or as an explicit
-argument), the optional Label will be aligned in the direction 'dir',
-using margin 'margin'.
+argument), the optional Label will be aligned in the direction ‘dir’,
+using margin ‘margin’.
- The function 'string graphic(string name, string options="")' returns
-a string that can be used to include an encapsulated 'PostScript' (EPS)
-file. Here, 'name' is the name of the file to include and 'options' is
+ The function ‘string graphic(string name, string options="")’ returns
+a string that can be used to include an encapsulated ‘PostScript’ (EPS)
+file. Here, ‘name’ is the name of the file to include and ‘options’ is
a string containing a comma-separated list of optional bounding box
-('bb=llx lly urx ury'), width ('width=value'), height ('height=value'),
-rotation ('angle=value'), scaling ('scale=factor'), clipping
-('clip=bool'), and draft mode ('draft=bool') parameters. The 'layer()'
+(‘bb=llx lly urx ury’), width (‘width=value’), height (‘height=value’),
+rotation (‘angle=value’), scaling (‘scale=factor’), clipping
+(‘clip=bool’), and draft mode (‘draft=bool’) parameters. The ‘layer()’
function can be used to force future objects to be drawn on top of the
included image:
label(graphic("file.eps","width=1cm"),(0,0),NE);
layer();
- The 'string baseline(string s, string template="\strut")' function
+ The ‘string baseline(string s, string template="\strut")’ function
can be used to enlarge the bounding box of labels to match a given
template, so that their baselines will be typeset on a horizontal line.
-See 'Pythagoras.asy' for an example.
+See ‘Pythagoras.asy’ for an example.
One can prevent labels from overwriting one another with the
-'overwrite' pen attribute (*note overwrite::).
+‘overwrite’ pen attribute (*note overwrite::).
- The structure 'object' defined in 'plain_Label.asy' allows Labels and
+ The structure ‘object’ defined in ‘plain_Label.asy’ allows Labels and
frames to be treated in a uniform manner. A group of objects may be
packed together into single frame with the routine
frame pack(pair align=2S ... object inset[]);
@@ -1264,15 +1268,15 @@ object draw(picture pic=currentpicture, Label L, envelope e,
object draw(picture pic=currentpicture, Label L, envelope e, pair position,
real xmargin=0, real ymargin=xmargin, pen p=currentpen,
filltype filltype=NoFill, bool above=true);
-Here 'envelope' is a boundary-drawing routine such as 'box', 'roundbox',
-or 'ellipse' defined in 'plain_boxes.asy' (*note envelope::).
+Here ‘envelope’ is a boundary-drawing routine such as ‘box’, ‘roundbox’,
+or ‘ellipse’ defined in ‘plain_boxes.asy’ (*note envelope::).
- The function 'path[] texpath(Label L)' returns the path array that
-TeX would fill to draw the Label 'L'.
+ The function ‘path[] texpath(Label L)’ returns the path array that
+TeX would fill to draw the Label ‘L’.
- The 'string minipage(string s, width=100pt)' function can be used to
-format string 's' into a paragraph of width 'width'. This example uses
-'minipage', 'clip', and 'graphic' to produce a CD label:
+ The ‘string minipage(string s, width=100pt)’ function can be used to
+format string ‘s’ into a paragraph of width ‘width’. This example uses
+‘minipage’, ‘clip’, and ‘graphic’ to produce a CD label:
[./CDlabel]
size(11.7cm,11.7cm);
@@ -1299,7 +1303,7 @@ File: asymptote.info, Node: Bezier curves, Next: Programming, Prev: Drawing c
***************
Each interior node of a cubic spline may be given a direction prefix or
-suffix '{dir}': the direction of the pair 'dir' specifies the direction
+suffix ‘{dir}’: the direction of the pair ‘dir’ specifies the direction
of the incoming or outgoing tangent, respectively, to the curve at that
node. Exterior nodes may be given direction specifiers only on their
interior side.
@@ -1330,10 +1334,10 @@ fraction t in [0,1] of each segment, not just for midpoints (t=1/2).
The Bezier curve constructed in this manner has the following
properties:
- * It is entirely contained in the convex hull of the given four
+ • It is entirely contained in the convex hull of the given four
points.
- * It starts heading from the first endpoint to the first control
+ • It starts heading from the first endpoint to the first control
point and finishes heading from the second control point to the
second endpoint.
@@ -1341,9 +1345,9 @@ properties:
this:
draw((0,0)..controls (0,100) and (100,100)..(100,0));
- However, it is usually more convenient to just use the '..' operator,
-which tells 'Asymptote' to choose its own control points using the
-algorithms described in Donald Knuth's monograph, The MetaFontbook,
+ However, it is usually more convenient to just use the ‘..’ operator,
+which tells ‘Asymptote’ to choose its own control points using the
+algorithms described in Donald Knuth’s monograph, The MetaFontbook,
Chapter 14. The user can still customize the guide (or path) by
specifying direction, tension, and curl values.
@@ -1355,18 +1359,18 @@ draw((100,0)..tension 2 ..(100,100)..(0,100));
draw((100,0)..tension 3 and 2 ..(100,100)..(0,100));
draw((100,0)..tension atleast 2 ..(100,100)..(0,100));
- In these examples there is a space between '2' and '..'. This is
-needed as '2.' is interpreted as a numerical constant.
+ In these examples there is a space between ‘2’ and ‘..’. This is
+needed as ‘2.’ is interpreted as a numerical constant.
The curl parameter specifies the curvature at the endpoints of a path
(0 means straight; the default value of 1 means approximately circular):
draw((100,0){curl 0}..(100,100)..{curl 0}(0,100));
- The 'MetaPost ...' path connector, which requests, when possible, an
+ The ‘MetaPost ...’ path connector, which requests, when possible, an
inflection-free curve confined to a triangle defined by the endpoints
-and directions, is implemented in 'Asymptote' as the convenient
-abbreviation '::' for '..tension atleast 1 ..' (the ellipsis '...' is
-used in 'Asymptote' to indicate a variable number of arguments; *note
+and directions, is implemented in ‘Asymptote’ as the convenient
+abbreviation ‘::’ for ‘..tension atleast 1 ..’ (the ellipsis ‘...’ is
+used in ‘Asymptote’ to indicate a variable number of arguments; *note
Rest arguments::). For example, compare
draw((0,0){up}..(100,25){right}..(200,0){down});
@@ -1376,8 +1380,8 @@ draw((0,0){up}::(100,25){right}::(200,0){down});
[./colons]
- The '---' connector is an abbreviation for '..tension atleast
-infinity..' and the '&' connector concatenates two paths, after first
+ The ‘---’ connector is an abbreviation for ‘..tension atleast
+infinity..’ and the ‘&’ connector concatenates two paths, after first
stripping off the last node of the first path (which normally should
coincide with the first node of the second path).
@@ -1402,10 +1406,10 @@ File: asymptote.info, Node: Programming, Next: LaTeX usage, Prev: Bezier curv
* Functions:: Traditional and high-order functions
* Arrays:: Dynamic vectors
* Casts:: Implicit and explicit casts
-* Import:: Importing external 'Asymptote' modules
+* Import:: Importing external ‘Asymptote’ modules
* Static:: Where to allocate your variable?
-Here is a short introductory example to the 'Asymptote' programming
+Here is a short introductory example to the ‘Asymptote’ programming
language that highlights the similarity of its control structures with
those of C, C++, and Java:
// This is a comment.
@@ -1429,7 +1433,7 @@ for(int i=0; i < 10; ++i) {
}
- 'Asymptote' supports 'while', 'do', 'break', and 'continue'
+ ‘Asymptote’ supports ‘while’, ‘do’, ‘break’, and ‘continue’
statements just as in C/C++. It also supports the Java-style shorthand
for iterating over all elements of an array:
@@ -1447,51 +1451,51 @@ File: asymptote.info, Node: Data types, Next: Paths and guides, Prev: Program
6.1 Data types
==============
-'Asymptote' supports the following data types (in addition to
+‘Asymptote’ supports the following data types (in addition to
user-defined types):
-'void'
+‘void’
The void type is used only by functions that take or return no
arguments.
-'bool'
- a boolean type that can only take on the values 'true' or 'false'.
+‘bool’
+ a boolean type that can only take on the values ‘true’ or ‘false’.
For example:
bool b=true;
- defines a boolean variable 'b' and initializes it to the value
- 'true'. If no initializer is given:
+ defines a boolean variable ‘b’ and initializes it to the value
+ ‘true’. If no initializer is given:
bool b;
- the value 'false' is assumed.
+ the value ‘false’ is assumed.
-'bool3'
- an extended boolean type that can take on the values 'true',
- 'default', or 'false'. A bool3 type can be cast to or from a bool.
- The default initializer for bool3 is 'default'.
+‘bool3’
+ an extended boolean type that can take on the values ‘true’,
+ ‘default’, or ‘false’. A bool3 type can be cast to or from a bool.
+ The default initializer for bool3 is ‘default’.
-'int'
- an integer type; if no initializer is given, the implicit value '0'
- is assumed. The minimum allowed value of an integer is 'intMin'
- and the maximum value is 'intMax'.
+‘int’
+ an integer type; if no initializer is given, the implicit value ‘0’
+ is assumed. The minimum allowed value of an integer is ‘intMin’
+ and the maximum value is ‘intMax’.
-'real'
+‘real’
a real number; this should be set to the highest-precision native
floating-point type on the architecture. The implicit initializer
- for reals is '0.0'. Real numbers have precision 'realEpsilon',
- with 'realDigits' significant digits. The smallest positive real
- number is 'realMin' and the largest positive real number is
- 'realMax'. The variables 'inf' and 'nan', along with the function
- 'bool isnan(real x)' are useful when floating-point exceptions are
- masked with the '-mask' command-line option (the default in
+ for reals is ‘0.0’. Real numbers have precision ‘realEpsilon’,
+ with ‘realDigits’ significant digits. The smallest positive real
+ number is ‘realMin’ and the largest positive real number is
+ ‘realMax’. The variables ‘inf’ and ‘nan’, along with the function
+ ‘bool isnan(real x)’ are useful when floating-point exceptions are
+ masked with the ‘-mask’ command-line option (the default in
interactive mode).
-'pair'
+‘pair’
complex number, that is, an ordered pair of real components
- '(x,y)'. The real and imaginary parts of a pair 'z' can read as
- 'z.x' and 'z.y'. We say that 'x' and 'y' are virtual members of
+ ‘(x,y)’. The real and imaginary parts of a pair ‘z’ can read as
+ ‘z.x’ and ‘z.y’. We say that ‘x’ and ‘y’ are virtual members of
the data element pair; they cannot be directly modified, however.
- The implicit initializer for pairs is '(0.0,0.0)'.
+ The implicit initializer for pairs is ‘(0.0,0.0)’.
There are a number of ways to take the complex conjugate of a pair:
pair z=(3,4);
@@ -1499,284 +1503,284 @@ user-defined types):
z=z.x-I*z.y;
z=conj(z);
- Here 'I' is the pair '(0,1)'. A number of built-in functions are
+ Here ‘I’ is the pair ‘(0,1)’. A number of built-in functions are
defined for pairs:
- 'pair conj(pair z)'
- returns the conjugate of 'z';
+ ‘pair conj(pair z)’
+ returns the conjugate of ‘z’;
- 'real length(pair z)'
- returns the complex modulus |'z'| of its argument 'z'. For
+ ‘real length(pair z)’
+ returns the complex modulus |‘z’| of its argument ‘z’. For
example,
pair z=(3,4);
length(z);
- returns the result 5. A synonym for 'length(pair)' is
- 'abs(pair)'. The function 'abs2(pair z)' returns |'z'|^2;
+ returns the result 5. A synonym for ‘length(pair)’ is
+ ‘abs(pair)’. The function ‘abs2(pair z)’ returns |‘z’|^2;
- 'real angle(pair z, bool warn=true)'
- returns the angle of 'z' in radians in the interval
- [-'pi','pi'] or '0' if 'warn' is 'false' and 'z=(0,0)' (rather
+ ‘real angle(pair z, bool warn=true)’
+ returns the angle of ‘z’ in radians in the interval
+ [-‘pi’,‘pi’] or ‘0’ if ‘warn’ is ‘false’ and ‘z=(0,0)’ (rather
than producing an error);
- 'real degrees(pair z, bool warn=true)'
- returns the angle of 'z' in degrees in the interval [0,360) or
- '0' if 'warn' is 'false' and 'z=(0,0)' (rather than producing
+ ‘real degrees(pair z, bool warn=true)’
+ returns the angle of ‘z’ in degrees in the interval [0,360) or
+ ‘0’ if ‘warn’ is ‘false’ and ‘z=(0,0)’ (rather than producing
an error);
- 'pair unit(pair z)'
- returns a unit vector in the direction of the pair 'z';
+ ‘pair unit(pair z)’
+ returns a unit vector in the direction of the pair ‘z’;
- 'pair expi(real angle)'
- returns a unit vector in the direction 'angle' measured in
+ ‘pair expi(real angle)’
+ returns a unit vector in the direction ‘angle’ measured in
radians;
- 'pair dir(real degrees)'
- returns a unit vector in the direction 'degrees' measured in
+ ‘pair dir(real degrees)’
+ returns a unit vector in the direction ‘degrees’ measured in
degrees;
- 'real xpart(pair z)'
- returns 'z.x';
+ ‘real xpart(pair z)’
+ returns ‘z.x’;
- 'real ypart(pair z)'
- returns 'z.y';
+ ‘real ypart(pair z)’
+ returns ‘z.y’;
- 'pair realmult(pair z, pair w)'
- returns the element-by-element product '(z.x*w.x,z.y*w.y)';
+ ‘pair realmult(pair z, pair w)’
+ returns the element-by-element product ‘(z.x*w.x,z.y*w.y)’;
- 'real dot(explicit pair z, explicit pair w)'
- returns the dot product 'z.x*w.x+z.y*w.y';
+ ‘real dot(explicit pair z, explicit pair w)’
+ returns the dot product ‘z.x*w.x+z.y*w.y’;
- 'real cross(explicit pair z, explicit pair w)'
- returns the 2D scalar product 'z.x*w.y-z.y*w.x';
+ ‘real cross(explicit pair z, explicit pair w)’
+ returns the 2D scalar product ‘z.x*w.y-z.y*w.x’;
- 'real orient(pair a, pair b, pair c);'
- returns a positive (negative) value if 'a--b--c--cycle' is
+ ‘real orient(pair a, pair b, pair c);’
+ returns a positive (negative) value if ‘a--b--c--cycle’ is
oriented counterclockwise (clockwise) or zero if all three
points are colinear. Equivalently, a positive (negative)
- value is returned if 'c' lies to the left (right) of the line
- through 'a' and 'b' or zero if 'c' lies on this line. The
+ value is returned if ‘c’ lies to the left (right) of the line
+ through ‘a’ and ‘b’ or zero if ‘c’ lies on this line. The
value returned can be expressed in terms of the 2D scalar
- cross product as 'cross(a-c,b-c)', which is the determinant
+ cross product as ‘cross(a-c,b-c)’, which is the determinant
|a.x a.y 1|
|b.x b.y 1|
|c.x c.y 1|
- 'real incircle(pair a, pair b, pair c, pair d);'
- returns a positive (negative) value if 'd' lies inside
+ ‘real incircle(pair a, pair b, pair c, pair d);’
+ returns a positive (negative) value if ‘d’ lies inside
(outside) the circle passing through the
- counterclockwise-oriented points 'a,b,c' or zero if 'd' lies
+ counterclockwise-oriented points ‘a,b,c’ or zero if ‘d’ lies
on the this circle. The value returned is the determinant
|a.x a.y a.x^2+a.y^2 1|
|b.x b.y b.x^2+b.y^2 1|
|c.x c.y c.x^2+c.y^2 1|
|d.x d.y d.x^2+d.y^2 1|
- 'pair minbound(pair z, pair w)'
- returns '(min(z.x,w.x),min(z.y,w.y))';
+ ‘pair minbound(pair z, pair w)’
+ returns ‘(min(z.x,w.x),min(z.y,w.y))’;
- 'pair maxbound(pair z, pair w)'
- returns '(max(z.x,w.x),max(z.y,w.y))'.
+ ‘pair maxbound(pair z, pair w)’
+ returns ‘(max(z.x,w.x),max(z.y,w.y))’.
-'triple'
- an ordered triple of real components '(x,y,z)' used for
+‘triple’
+ an ordered triple of real components ‘(x,y,z)’ used for
three-dimensional drawings. The respective components of a triple
- 'v' can read as 'v.x', 'v.y', and 'v.z'. The implicit initializer
- for triples is '(0.0,0.0,0.0)'.
+ ‘v’ can read as ‘v.x’, ‘v.y’, and ‘v.z’. The implicit initializer
+ for triples is ‘(0.0,0.0,0.0)’.
Here are the built-in functions for triples:
- 'real length(triple v)'
- returns the length |'v'| of its argument 'v'. A synonym for
- 'length(triple)' is 'abs(triple)'. The function 'abs2(triple
- v)' returns |'v'|^2;
-
- 'real polar(triple v, bool warn=true)'
- returns the colatitude of 'v' measured from the z axis in
- radians or '0' if 'warn' is 'false' and 'v=O' (rather than
+ ‘real length(triple v)’
+ returns the length |‘v’| of its argument ‘v’. A synonym for
+ ‘length(triple)’ is ‘abs(triple)’. The function ‘abs2(triple
+ v)’ returns |‘v’|^2;
+
+ ‘real polar(triple v, bool warn=true)’
+ returns the colatitude of ‘v’ measured from the z axis in
+ radians or ‘0’ if ‘warn’ is ‘false’ and ‘v=O’ (rather than
producing an error);
- 'real azimuth(triple v, bool warn=true)'
- returns the longitude of 'v' measured from the x axis in
- radians or '0' if 'warn' is 'false' and 'v.x=v.y=0' (rather
+ ‘real azimuth(triple v, bool warn=true)’
+ returns the longitude of ‘v’ measured from the x axis in
+ radians or ‘0’ if ‘warn’ is ‘false’ and ‘v.x=v.y=0’ (rather
than producing an error);
- 'real colatitude(triple v, bool warn=true)'
- returns the colatitude of 'v' measured from the z axis in
- degrees or '0' if 'warn' is 'false' and 'v=O' (rather than
+ ‘real colatitude(triple v, bool warn=true)’
+ returns the colatitude of ‘v’ measured from the z axis in
+ degrees or ‘0’ if ‘warn’ is ‘false’ and ‘v=O’ (rather than
producing an error);
- 'real latitude(triple v, bool warn=true)'
- returns the latitude of 'v' measured from the xy plane in
- degrees or '0' if 'warn' is 'false' and 'v=O' (rather than
+ ‘real latitude(triple v, bool warn=true)’
+ returns the latitude of ‘v’ measured from the xy plane in
+ degrees or ‘0’ if ‘warn’ is ‘false’ and ‘v=O’ (rather than
producing an error);
- 'real longitude(triple v, bool warn=true)'
- returns the longitude of 'v' measured from the x axis in
- degrees or '0' if 'warn' is 'false' and 'v.x=v.y=0' (rather
+ ‘real longitude(triple v, bool warn=true)’
+ returns the longitude of ‘v’ measured from the x axis in
+ degrees or ‘0’ if ‘warn’ is ‘false’ and ‘v.x=v.y=0’ (rather
than producing an error);
- 'triple unit(triple v)'
- returns a unit triple in the direction of the triple 'v';
+ ‘triple unit(triple v)’
+ returns a unit triple in the direction of the triple ‘v’;
- 'triple expi(real polar, real azimuth)'
- returns a unit triple in the direction '(polar,azimuth)'
+ ‘triple expi(real polar, real azimuth)’
+ returns a unit triple in the direction ‘(polar,azimuth)’
measured in radians;
- 'triple dir(real colatitude, real longitude)'
+ ‘triple dir(real colatitude, real longitude)’
returns a unit triple in the direction
- '(colatitude,longitude)' measured in degrees;
+ ‘(colatitude,longitude)’ measured in degrees;
- 'real xpart(triple v)'
- returns 'v.x';
+ ‘real xpart(triple v)’
+ returns ‘v.x’;
- 'real ypart(triple v)'
- returns 'v.y';
+ ‘real ypart(triple v)’
+ returns ‘v.y’;
- 'real zpart(triple v)'
- returns 'v.z';
+ ‘real zpart(triple v)’
+ returns ‘v.z’;
- 'real dot(triple u, triple v)'
- returns the dot product 'u.x*v.x+u.y*v.y+u.z*v.z';
+ ‘real dot(triple u, triple v)’
+ returns the dot product ‘u.x*v.x+u.y*v.y+u.z*v.z’;
- 'triple cross(triple u, triple v)'
+ ‘triple cross(triple u, triple v)’
returns the cross product
- '(u.y*v.z-u.z*v.y,u.z*v.x-u.x*v.z,u.x*v.y-v.x*u.y)';
+ ‘(u.y*v.z-u.z*v.y,u.z*v.x-u.x*v.z,u.x*v.y-v.x*u.y)’;
- 'triple minbound(triple u, triple v)'
- returns '(min(u.x,v.x),min(u.y,v.y),min(u.z,v.z))';
+ ‘triple minbound(triple u, triple v)’
+ returns ‘(min(u.x,v.x),min(u.y,v.y),min(u.z,v.z))’;
- 'triple maxbound(triple u, triple v)'
- returns '(max(u.x,v.x),max(u.y,v.y),max(u.z,v.z)').
+ ‘triple maxbound(triple u, triple v)’
+ returns ‘(max(u.x,v.x),max(u.y,v.y),max(u.z,v.z)’).
-'string'
- a character string, implemented using the STL 'string' class.
+‘string’
+ a character string, implemented using the STL ‘string’ class.
- Strings delimited by double quotes ('"') are subject to the
+ Strings delimited by double quotes (‘"’) are subject to the
following mappings to allow the use of double quotes in TeX
- (e.g. for using the 'babel' package, *note babel::):
-
- * \" maps to "
- * \\ maps to \\
-
- Strings delimited by single quotes (''') have the same mappings as
- character strings in ANSI 'C':
-
- * \' maps to '
- * \" maps to "
- * \? maps to ?
- * \\ maps to backslash
- * \a maps to alert
- * \b maps to backspace
- * \f maps to form feed
- * \n maps to newline
- * \r maps to carriage return
- * \t maps to tab
- * \v maps to vertical tab
- * \0-\377 map to corresponding octal byte
- * \x0-\xFF map to corresponding hexadecimal byte
-
- The implicit initializer for strings is the empty string '""'.
- Strings may be concatenated with the '+' operator. In the
- following string functions, position '0' denotes the start of the
+ (e.g. for using the ‘babel’ package, *note babel::):
+
+ • \" maps to "
+ • \\ maps to \\
+
+ Strings delimited by single quotes (‘'’) have the same mappings as
+ character strings in ANSI ‘C’:
+
+ • \’ maps to ’
+ • \" maps to "
+ • \? maps to ?
+ • \\ maps to backslash
+ • \a maps to alert
+ • \b maps to backspace
+ • \f maps to form feed
+ • \n maps to newline
+ • \r maps to carriage return
+ • \t maps to tab
+ • \v maps to vertical tab
+ • \0-\377 map to corresponding octal byte
+ • \x0-\xFF map to corresponding hexadecimal byte
+
+ The implicit initializer for strings is the empty string ‘""’.
+ Strings may be concatenated with the ‘+’ operator. In the
+ following string functions, position ‘0’ denotes the start of the
string:
- 'int length(string s)'
- returns the length of the string 's';
-
- 'int find(string s, string t, int pos=0)'
- returns the position of the first occurrence of string 't' in
- string 's' at or after position 'pos', or -1 if 't' is not a
- substring of 's';
-
- 'int rfind(string s, string t, int pos=-1)'
- returns the position of the last occurrence of string 't' in
- string 's' at or before position 'pos' (if 'pos'=-1, at the
- end of the string 's'), or -1 if 't' is not a substring of
- 's';
-
- 'string insert(string s, int pos, string t)'
- returns the string formed by inserting string 't' at position
- 'pos' in 's';
-
- 'string erase(string s, int pos, int n)'
- returns the string formed by erasing the string of length 'n'
- (if 'n'=-1, to the end of the string 's') at position 'pos' in
- 's';
-
- 'string substr(string s, int pos, int n=-1)'
- returns the substring of 's' starting at position 'pos' and of
- length 'n' (if 'n'=-1, until the end of the string 's');
-
- 'string reverse(string s)'
- returns the string formed by reversing string 's';
-
- 'string replace(string s, string before, string after)'
- returns a string with all occurrences of the string 'before'
- in the string 's' changed to the string 'after';
-
- 'string replace(string s, string[][] table)'
- returns a string constructed by translating in string 's' all
- occurrences of the string 'before' in an array 'table' of
- string pairs {'before','after'} to the corresponding string
- 'after';
-
- 'string[] split(string s, string delimiter="")'
- returns an array of strings obtained by splitting 's' into
- substrings delimited by 'delimiter' (an empty delimiter
+ ‘int length(string s)’
+ returns the length of the string ‘s’;
+
+ ‘int find(string s, string t, int pos=0)’
+ returns the position of the first occurrence of string ‘t’ in
+ string ‘s’ at or after position ‘pos’, or -1 if ‘t’ is not a
+ substring of ‘s’;
+
+ ‘int rfind(string s, string t, int pos=-1)’
+ returns the position of the last occurrence of string ‘t’ in
+ string ‘s’ at or before position ‘pos’ (if ‘pos’=-1, at the
+ end of the string ‘s’), or -1 if ‘t’ is not a substring of
+ ‘s’;
+
+ ‘string insert(string s, int pos, string t)’
+ returns the string formed by inserting string ‘t’ at position
+ ‘pos’ in ‘s’;
+
+ ‘string erase(string s, int pos, int n)’
+ returns the string formed by erasing the string of length ‘n’
+ (if ‘n’=-1, to the end of the string ‘s’) at position ‘pos’ in
+ ‘s’;
+
+ ‘string substr(string s, int pos, int n=-1)’
+ returns the substring of ‘s’ starting at position ‘pos’ and of
+ length ‘n’ (if ‘n’=-1, until the end of the string ‘s’);
+
+ ‘string reverse(string s)’
+ returns the string formed by reversing string ‘s’;
+
+ ‘string replace(string s, string before, string after)’
+ returns a string with all occurrences of the string ‘before’
+ in the string ‘s’ changed to the string ‘after’;
+
+ ‘string replace(string s, string[][] table)’
+ returns a string constructed by translating in string ‘s’ all
+ occurrences of the string ‘before’ in an array ‘table’ of
+ string pairs {‘before’,‘after’} to the corresponding string
+ ‘after’;
+
+ ‘string[] split(string s, string delimiter="")’
+ returns an array of strings obtained by splitting ‘s’ into
+ substrings delimited by ‘delimiter’ (an empty delimiter
signifies a space, but with duplicate delimiters discarded);
- 'string[] array(string s)'
- returns an array of strings obtained by splitting 's' into
+ ‘string[] array(string s)’
+ returns an array of strings obtained by splitting ‘s’ into
individual characters. The inverse operation is provided by
- 'operator +(...string[] a)'.
+ ‘operator +(...string[] a)’.
- 'string format(string s, int n, string locale="")'
- returns a string containing 'n' formatted according to the
- C-style format string 's' using locale 'locale' (or the
+ ‘string format(string s, int n, string locale="")’
+ returns a string containing ‘n’ formatted according to the
+ C-style format string ‘s’ using locale ‘locale’ (or the
current locale if an empty string is specified), following the
- behaviour of the C function 'fprintf'), except that only one
+ behaviour of the C function ‘fprintf’), except that only one
data field is allowed.
- 'string format(string s=defaultformat, bool forcemath=false, string s=defaultseparator, real x, string locale="")'
- returns a string containing 'x' formatted according to the
- C-style format string 's' using locale 'locale' (or the
+ ‘string format(string s=defaultformat, bool forcemath=false, string s=defaultseparator, real x, string locale="")’
+ returns a string containing ‘x’ formatted according to the
+ C-style format string ‘s’ using locale ‘locale’ (or the
current locale if an empty string is specified), following the
- behaviour of the C function 'fprintf'), except that only one
+ behaviour of the C function ‘fprintf’), except that only one
data field is allowed, trailing zeros are removed by default
- (unless '#' is specified), and if 's' specifies math mode or
- 'forcemath=true', TeX is used to typeset scientific notation
- using the 'defaultseparator="\!\times\!";';
+ (unless ‘#’ is specified), and if ‘s’ specifies math mode or
+ ‘forcemath=true’, TeX is used to typeset scientific notation
+ using the ‘defaultseparator="\!\times\!";’;
- 'int hex(string s);'
- casts a hexadecimal string 's' to an integer;
+ ‘int hex(string s);’
+ casts a hexadecimal string ‘s’ to an integer;
- 'int ascii(string s);'
- returns the ASCII code for the first character of string 's';
+ ‘int ascii(string s);’
+ returns the ASCII code for the first character of string ‘s’;
- 'string string(real x, int digits=realDigits)'
- casts 'x' to a string using precision 'digits' and the C
+ ‘string string(real x, int digits=realDigits)’
+ casts ‘x’ to a string using precision ‘digits’ and the C
locale;
- 'string locale(string s="")'
+ ‘string locale(string s="")’
sets the locale to the given string, if nonempty, and returns
the current locale;
- 'string time(string format="%a %b %d %T %Z %Y")'
+ ‘string time(string format="%a %b %d %T %Z %Y")’
returns the current time formatted by the ANSI C routine
- 'strftime' according to the string 'format' using the current
+ ‘strftime’ according to the string ‘format’ using the current
locale. Thus
time();
time("%a %b %d %H:%M:%S %Z %Y");
are equivalent ways of returning the current time in the
- default format used by the 'UNIX' 'date' command;
+ default format used by the ‘UNIX’ ‘date’ command;
- 'int seconds(string t="", string format="")'
+ ‘int seconds(string t="", string format="")’
returns the time measured in seconds after the Epoch (Thu Jan
01 00:00:00 UTC 1970) as determined by the ANSI C routine
- 'strptime' according to the string 'format' using the current
- locale, or the current time if 't' is the empty string. Note
- that the '"%Z"' extension to the POSIX 'strptime'
+ ‘strptime’ according to the string ‘format’ using the current
+ locale, or the current time if ‘t’ is the empty string. Note
+ that the ‘"%Z"’ extension to the POSIX ‘strptime’
specification is ignored by the current GNU C Library. If an
error occurs, the value -1 is returned. Here are some
examples:
@@ -1784,49 +1788,49 @@ user-defined types):
seconds(time("%b %d %r %z %Y"),"%b %d %r %z %Y");
seconds(time("%b %d %r %Z %Y"),"%b %d %r "+time("%Z")+" %Y");
1+(seconds()-seconds("Jan 1","%b %d"))/(24*60*60);
- The last example returns today's ordinal date, measured from
+ The last example returns today’s ordinal date, measured from
the beginning of the year.
- 'string time(int seconds, string format="%a %b %d %T %Z %Y")'
- returns the time corresponding to 'seconds' seconds after the
+ ‘string time(int seconds, string format="%a %b %d %T %Z %Y")’
+ returns the time corresponding to ‘seconds’ seconds after the
Epoch (Thu Jan 01 00:00:00 UTC 1970) formatted by the ANSI C
- routine 'strftime' according to the string 'format' using the
+ routine ‘strftime’ according to the string ‘format’ using the
current locale. For example, to return the date corresponding
to 24 hours ago:
time(seconds()-24*60*60);
- 'int system(string s)'
- 'int system(string[] s)'
- if the setting 'safe' is false, call the arbitrary system
- command 's';
+ ‘int system(string s)’
+ ‘int system(string[] s)’
+ if the setting ‘safe’ is false, call the arbitrary system
+ command ‘s’;
- 'void asy(string format, bool overwrite=false ... string[] s)'
- conditionally process each file name in array 's' in a new
- environment, using format 'format', overwriting the output
- file only if 'overwrite' is true;
+ ‘void asy(string format, bool overwrite=false ... string[] s)’
+ conditionally process each file name in array ‘s’ in a new
+ environment, using format ‘format’, overwriting the output
+ file only if ‘overwrite’ is true;
- 'void abort(string s="")'
+ ‘void abort(string s="")’
aborts execution (with a non-zero return code in batch mode);
- if string 's' is nonempty, a diagnostic message constructed
- from the source file, line number, and 's' is printed;
+ if string ‘s’ is nonempty, a diagnostic message constructed
+ from the source file, line number, and ‘s’ is printed;
- 'void assert(bool b, string s="")'
- aborts execution with an error message constructed from 's' if
- 'b=false';
+ ‘void assert(bool b, string s="")’
+ aborts execution with an error message constructed from ‘s’ if
+ ‘b=false’;
- 'void exit()'
+ ‘void exit()’
exits (with a zero error return code in batch mode);
- 'void sleep(int seconds)'
+ ‘void sleep(int seconds)’
pauses for the given number of seconds;
- 'void usleep(int microseconds)'
+ ‘void usleep(int microseconds)’
pauses for the given number of microseconds;
- 'void beep()'
+ ‘void beep()’
produces a beep on the console;
- As in C/C++, complicated types may be abbreviated with 'typedef' (see
+ As in C/C++, complicated types may be abbreviated with ‘typedef’ (see
the example in *note Functions::).

@@ -1835,37 +1839,37 @@ File: asymptote.info, Node: Paths and guides, Next: Pens, Prev: Data types,
6.2 Paths and guides
====================
-'path'
+‘path’
a cubic spline resolved into a fixed path. The implicit
- initializer for paths is 'nullpath'.
+ initializer for paths is ‘nullpath’.
- For example, the routine 'circle(pair c, real r)', which returns a
- Bezier curve approximating a circle of radius 'r' centered on 'c',
- is based on 'unitcircle' (*note unitcircle::):
+ For example, the routine ‘circle(pair c, real r)’, which returns a
+ Bezier curve approximating a circle of radius ‘r’ centered on ‘c’,
+ is based on ‘unitcircle’ (*note unitcircle::):
path circle(pair c, real r)
{
return shift(c)*scale(r)*unitcircle;
}
If high accuracy is needed, a true circle may be produced with the
- routine 'Circle' defined in the module 'graph':
+ routine ‘Circle’ defined in the module ‘graph’:
import graph;
path Circle(pair c, real r, int n=nCircle);
- A circular arc consistent with 'circle' centered on 'c' with radius
- 'r' from 'angle1' to 'angle2' degrees, drawing counterclockwise if
- 'angle2 >= angle1', can be constructed with
+ A circular arc consistent with ‘circle’ centered on ‘c’ with radius
+ ‘r’ from ‘angle1’ to ‘angle2’ degrees, drawing counterclockwise if
+ ‘angle2 >= angle1’, can be constructed with
path arc(pair c, real r, real angle1, real angle2);
One may also specify the direction explicitly:
path arc(pair c, real r, real angle1, real angle2, bool direction);
Here the direction can be specified as CCW (counter-clockwise) or
- CW (clockwise). For convenience, an arc centered at 'c' from pair
- 'z1' to 'z2' (assuming '|z2-c|=|z1-c|') in the may also be
+ CW (clockwise). For convenience, an arc centered at ‘c’ from pair
+ ‘z1’ to ‘z2’ (assuming ‘|z2-c|=|z1-c|’) in the may also be
constructed with
path arc(pair c, explicit pair z1, explicit pair z2,
bool direction=CCW)
If high accuracy is needed, true arcs may be produced with routines
- in the module 'graph' that produce Bezier curves with 'n' control
+ in the module ‘graph’ that produce Bezier curves with ‘n’ control
points:
import graph;
path Arc(pair c, real r, real angle1, real angle2, bool direction,
@@ -1880,7 +1884,7 @@ File: asymptote.info, Node: Paths and guides, Next: Pens, Prev: Data types,
return shift(c)*scale(a,b)*unitcircle;
}
- A brace can be constructed between pairs 'a' and 'b' with
+ A brace can be constructed between pairs ‘a’ and ‘b’ with
path brace(pair a, pair b, real amplitude=bracedefaultratio*length(b-a));
This example illustrates the use of all five guide connectors
@@ -1905,246 +1909,246 @@ File: asymptote.info, Node: Paths and guides, Next: Pens, Prev: Data types,
Here are some useful functions for paths:
- 'int length(path p);'
- This is the number of (linear or cubic) segments in path 'p'.
- If 'p' is cyclic, this is the same as the number of nodes in
- 'p'.
+ ‘int length(path p);’
+ This is the number of (linear or cubic) segments in path ‘p’.
+ If ‘p’ is cyclic, this is the same as the number of nodes in
+ ‘p’.
- 'int size(path p);'
- This is the number of nodes in the path 'p'. If 'p' is
- cyclic, this is the same as 'length(p)'.
+ ‘int size(path p);’
+ This is the number of nodes in the path ‘p’. If ‘p’ is
+ cyclic, this is the same as ‘length(p)’.
- 'bool cyclic(path p);'
- returns 'true' iff path 'p' is cyclic.
+ ‘bool cyclic(path p);’
+ returns ‘true’ iff path ‘p’ is cyclic.
- 'bool straight(path p, int i);'
- returns 'true' iff the segment of path 'p' between node 'i'
- and node 'i+1' is straight.
+ ‘bool straight(path p, int i);’
+ returns ‘true’ iff the segment of path ‘p’ between node ‘i’
+ and node ‘i+1’ is straight.
- 'bool piecewisestraight(path p)'
- returns 'true' iff the path 'p' is piecewise straight.
+ ‘bool piecewisestraight(path p)’
+ returns ‘true’ iff the path ‘p’ is piecewise straight.
- 'pair point(path p, int t);'
- If 'p' is cyclic, return the coordinates of node 't' mod
- 'length(p)'. Otherwise, return the coordinates of node 't',
- unless 't' < 0 (in which case 'point(0)' is returned) or 't' >
- 'length(p)' (in which case 'point(length(p))' is returned).
+ ‘pair point(path p, int t);’
+ If ‘p’ is cyclic, return the coordinates of node ‘t’ mod
+ ‘length(p)’. Otherwise, return the coordinates of node ‘t’,
+ unless ‘t’ < 0 (in which case ‘point(0)’ is returned) or ‘t’ >
+ ‘length(p)’ (in which case ‘point(length(p))’ is returned).
- 'pair point(path p, real t);'
+ ‘pair point(path p, real t);’
This returns the coordinates of the point between node
- 'floor(t)' and 'floor(t)+1' corresponding to the cubic spline
- parameter 't-floor(t)' (*note Bezier curves::). If 't' lies
- outside the range [0,'length(p)'], it is first reduced modulo
- 'length(p)' in the case where 'p' is cyclic or else converted
- to the corresponding endpoint of 'p'.
-
- 'pair dir(path p, int t, int sign=0, bool normalize=true);'
- If 'sign < 0', return the direction (as a pair) of the
- incoming tangent to path 'p' at node 't'; if 'sign > 0',
- return the direction of the outgoing tangent. If 'sign=0',
+ ‘floor(t)’ and ‘floor(t)+1’ corresponding to the cubic spline
+ parameter ‘t-floor(t)’ (*note Bezier curves::). If ‘t’ lies
+ outside the range [0,‘length(p)’], it is first reduced modulo
+ ‘length(p)’ in the case where ‘p’ is cyclic or else converted
+ to the corresponding endpoint of ‘p’.
+
+ ‘pair dir(path p, int t, int sign=0, bool normalize=true);’
+ If ‘sign < 0’, return the direction (as a pair) of the
+ incoming tangent to path ‘p’ at node ‘t’; if ‘sign > 0’,
+ return the direction of the outgoing tangent. If ‘sign=0’,
the mean of these two directions is returned.
- 'pair dir(path p, real t, bool normalize=true);'
- returns the direction of the tangent to path 'p' at the point
- between node 'floor(t)' and 'floor(t)+1' corresponding to the
- cubic spline parameter 't-floor(t)' (*note Bezier curves::).
+ ‘pair dir(path p, real t, bool normalize=true);’
+ returns the direction of the tangent to path ‘p’ at the point
+ between node ‘floor(t)’ and ‘floor(t)+1’ corresponding to the
+ cubic spline parameter ‘t-floor(t)’ (*note Bezier curves::).
- 'pair dir(path p)'
+ ‘pair dir(path p)’
returns dir(p,length(p)).
- 'pair dir(path p, path q)'
+ ‘pair dir(path p, path q)’
returns unit(dir(p)+dir(q)).
- 'pair accel(path p, int t, int sign=0);'
- If 'sign < 0', return the acceleration of the incoming path
- 'p' at node 't'; if 'sign > 0', return the acceleration of the
- outgoing path. If 'sign=0', the mean of these two
+ ‘pair accel(path p, int t, int sign=0);’
+ If ‘sign < 0’, return the acceleration of the incoming path
+ ‘p’ at node ‘t’; if ‘sign > 0’, return the acceleration of the
+ outgoing path. If ‘sign=0’, the mean of these two
accelerations is returned.
- 'pair accel(path p, real t);'
- returns the acceleration of the path 'p' at the point 't'.
+ ‘pair accel(path p, real t);’
+ returns the acceleration of the path ‘p’ at the point ‘t’.
- 'real radius(path p, real t);'
- returns the radius of curvature of the path 'p' at the point
- 't'.
+ ‘real radius(path p, real t);’
+ returns the radius of curvature of the path ‘p’ at the point
+ ‘t’.
- 'pair precontrol(path p, int t);'
- returns the precontrol point of 'p' at node 't'.
+ ‘pair precontrol(path p, int t);’
+ returns the precontrol point of ‘p’ at node ‘t’.
- 'pair precontrol(path p, real t);'
- returns the effective precontrol point of 'p' at parameter
- 't'.
+ ‘pair precontrol(path p, real t);’
+ returns the effective precontrol point of ‘p’ at parameter
+ ‘t’.
- 'pair postcontrol(path p, int t);'
- returns the postcontrol point of 'p' at node 't'.
+ ‘pair postcontrol(path p, int t);’
+ returns the postcontrol point of ‘p’ at node ‘t’.
- 'pair postcontrol(path p, real t);'
- returns the effective postcontrol point of 'p' at parameter
- 't'.
+ ‘pair postcontrol(path p, real t);’
+ returns the effective postcontrol point of ‘p’ at parameter
+ ‘t’.
- 'real arclength(path p);'
+ ‘real arclength(path p);’
returns the length (in user coordinates) of the piecewise
- linear or cubic curve that path 'p' represents.
+ linear or cubic curve that path ‘p’ represents.
- 'real arctime(path p, real L);'
+ ‘real arctime(path p, real L);’
returns the path "time", a real number between 0 and the
- length of the path in the sense of 'point(path p, real t)', at
+ length of the path in the sense of ‘point(path p, real t)’, at
which the cumulative arclength (measured from the beginning of
- the path) equals 'L'.
+ the path) equals ‘L’.
- 'pair arcpoint(path p, real L);'
- returns 'point(p,arctime(p,L))'.
+ ‘pair arcpoint(path p, real L);’
+ returns ‘point(p,arctime(p,L))’.
- 'real dirtime(path p, pair z);'
+ ‘real dirtime(path p, pair z);’
returns the first "time", a real number between 0 and the
- length of the path in the sense of 'point(path, real)', at
- which the tangent to the path has the direction of pair 'z',
+ length of the path in the sense of ‘point(path, real)’, at
+ which the tangent to the path has the direction of pair ‘z’,
or -1 if this never happens.
- 'real reltime(path p, real l);'
- returns the time on path 'p' at the relative fraction 'l' of
+ ‘real reltime(path p, real l);’
+ returns the time on path ‘p’ at the relative fraction ‘l’ of
its arclength.
- 'pair relpoint(path p, real l);'
- returns the point on path 'p' at the relative fraction 'l' of
+ ‘pair relpoint(path p, real l);’
+ returns the point on path ‘p’ at the relative fraction ‘l’ of
its arclength.
- 'pair midpoint(path p);'
- returns the point on path 'p' at half of its arclength.
+ ‘pair midpoint(path p);’
+ returns the point on path ‘p’ at half of its arclength.
- 'path reverse(path p);'
- returns a path running backwards along 'p'.
+ ‘path reverse(path p);’
+ returns a path running backwards along ‘p’.
- 'path subpath(path p, int a, int b);'
- returns the subpath of 'p' running from node 'a' to node 'b'.
- If 'a' > 'b', the direction of the subpath is reversed.
+ ‘path subpath(path p, int a, int b);’
+ returns the subpath of ‘p’ running from node ‘a’ to node ‘b’.
+ If ‘a’ > ‘b’, the direction of the subpath is reversed.
- 'path subpath(path p, real a, real b);'
- returns the subpath of 'p' running from path time 'a' to path
- time 'b', in the sense of 'point(path, real)'. If 'a' > 'b',
+ ‘path subpath(path p, real a, real b);’
+ returns the subpath of ‘p’ running from path time ‘a’ to path
+ time ‘b’, in the sense of ‘point(path, real)’. If ‘a’ > ‘b’,
the direction of the subpath is reversed.
- 'real[] intersect(path p, path q, real fuzz=-1);'
- If 'p' and 'q' have at least one intersection point, return a
+ ‘real[] intersect(path p, path q, real fuzz=-1);’
+ If ‘p’ and ‘q’ have at least one intersection point, return a
real array of length 2 containing the times representing the
- respective path times along 'p' and 'q', in the sense of
- 'point(path, real)', for one such intersection point (as
- chosen by the algorithm described on page 137 of 'The
- MetaFontbook'). The computations are performed to the
- absolute error specified by 'fuzz', or if 'fuzz < 0', to
+ respective path times along ‘p’ and ‘q’, in the sense of
+ ‘point(path, real)’, for one such intersection point (as
+ chosen by the algorithm described on page 137 of ‘The
+ MetaFontbook’). The computations are performed to the
+ absolute error specified by ‘fuzz’, or if ‘fuzz < 0’, to
machine precision. If the paths do not intersect, return a
real array of length 0.
- 'real[][] intersections(path p, path q, real fuzz=-1);'
+ ‘real[][] intersections(path p, path q, real fuzz=-1);’
Return all (unless there are infinitely many) intersection
- times of paths 'p' and 'q' as a sorted array of real arrays of
+ times of paths ‘p’ and ‘q’ as a sorted array of real arrays of
length 2 (*note sort::). The computations are performed to
- the absolute error specified by 'fuzz', or if 'fuzz < 0', to
+ the absolute error specified by ‘fuzz’, or if ‘fuzz < 0’, to
machine precision.
- 'real[] intersections(path p, explicit pair a, explicit pair b, real fuzz=-1);'
+ ‘real[] intersections(path p, explicit pair a, explicit pair b, real fuzz=-1);’
Return all (unless there are infinitely many) intersection
- times of path 'p' with the (infinite) line through points 'a'
- and 'b' as a sorted array. The intersections returned are
+ times of path ‘p’ with the (infinite) line through points ‘a’
+ and ‘b’ as a sorted array. The intersections returned are
guaranteed to be correct to within the absolute error
- specified by 'fuzz', or if 'fuzz < 0', to machine precision.
+ specified by ‘fuzz’, or if ‘fuzz < 0’, to machine precision.
- 'real[] times(path p, real x)'
- returns all intersection times of path 'p' with the vertical
- line through '(x,0)'.
+ ‘real[] times(path p, real x)’
+ returns all intersection times of path ‘p’ with the vertical
+ line through ‘(x,0)’.
- 'real[] times(path p, explicit pair z)'
- returns all intersection times of path 'p' with the horizontal
- line through '(0,z.y)'.
+ ‘real[] times(path p, explicit pair z)’
+ returns all intersection times of path ‘p’ with the horizontal
+ line through ‘(0,z.y)’.
- 'real[] mintimes(path p)'
+ ‘real[] mintimes(path p)’
returns an array of length 2 containing times at which path
- 'p' reaches its minimal horizontal and vertical extents,
+ ‘p’ reaches its minimal horizontal and vertical extents,
respectively.
- 'real[] maxtimes(path p)'
+ ‘real[] maxtimes(path p)’
returns an array of length 2 containing times at which path
- 'p' reaches its maximal horizontal and vertical extents,
+ ‘p’ reaches its maximal horizontal and vertical extents,
respectively.
- 'pair intersectionpoint(path p, path q, real fuzz=-1);'
+ ‘pair intersectionpoint(path p, path q, real fuzz=-1);’
returns the intersection point
- 'point(p,intersect(p,q,fuzz)[0])'.
+ ‘point(p,intersect(p,q,fuzz)[0])’.
- 'pair[] intersectionpoints(path p, path q, real fuzz=-1);'
+ ‘pair[] intersectionpoints(path p, path q, real fuzz=-1);’
returns an array containing all intersection points of the
- paths 'p' and 'q'.
+ paths ‘p’ and ‘q’.
- 'pair extension(pair P, pair Q, pair p, pair q);'
+ ‘pair extension(pair P, pair Q, pair p, pair q);’
returns the intersection point of the extensions of the line
- segments 'P--Q' and 'p--q', or if the lines are parallel,
- '(infinity,infinity)'.
+ segments ‘P--Q’ and ‘p--q’, or if the lines are parallel,
+ ‘(infinity,infinity)’.
- 'slice cut(path p, path knife, int n);'
- returns the portions of path 'p' before and after the 'n'th
- intersection of 'p' with path 'knife' as a structure 'slice'
+ ‘slice cut(path p, path knife, int n);’
+ returns the portions of path ‘p’ before and after the ‘n’th
+ intersection of ‘p’ with path ‘knife’ as a structure ‘slice’
(if no intersection exist is found, the entire path is
- considered to be 'before' the intersection):
+ considered to be ‘before’ the intersection):
struct slice {
path before,after;
}
- The argument 'n' is treated as modulo the number of
+ The argument ‘n’ is treated as modulo the number of
intersections.
- 'slice firstcut(path p, path knife);'
- equivalent to 'cut(p,knife,0);' Note that 'firstcut.after'
- plays the role of the 'MetaPost cutbefore' command.
+ ‘slice firstcut(path p, path knife);’
+ equivalent to ‘cut(p,knife,0);’ Note that ‘firstcut.after’
+ plays the role of the ‘MetaPost cutbefore’ command.
- 'slice lastcut(path p, path knife);'
- equivalent to 'cut(p,knife,-1);' Note that 'lastcut.before'
- plays the role of the 'MetaPost cutafter' command.
+ ‘slice lastcut(path p, path knife);’
+ equivalent to ‘cut(p,knife,-1);’ Note that ‘lastcut.before’
+ plays the role of the ‘MetaPost cutafter’ command.
- 'path buildcycle(... path[] p);'
+ ‘path buildcycle(... path[] p);’
This returns the path surrounding a region bounded by a list
of two or more consecutively intersecting paths, following the
- behaviour of the 'MetaPost buildcycle' command.
+ behaviour of the ‘MetaPost buildcycle’ command.
- 'pair min(path p);'
+ ‘pair min(path p);’
returns the pair (left,bottom) for the path bounding box of
- path 'p'.
+ path ‘p’.
- 'pair max(path p);'
+ ‘pair max(path p);’
returns the pair (right,top) for the path bounding box of path
- 'p'.
+ ‘p’.
- 'int windingnumber(path p, pair z);'
- returns the winding number of the cyclic path 'p' relative to
- the point 'z'. The winding number is positive if the path
- encircles 'z' in the counterclockwise direction. If 'z' lies
- on 'p' the constant 'undefined' (defined to be the largest odd
+ ‘int windingnumber(path p, pair z);’
+ returns the winding number of the cyclic path ‘p’ relative to
+ the point ‘z’. The winding number is positive if the path
+ encircles ‘z’ in the counterclockwise direction. If ‘z’ lies
+ on ‘p’ the constant ‘undefined’ (defined to be the largest odd
integer) is returned.
- 'bool interior(int windingnumber, pen fillrule)'
- returns true if 'windingnumber' corresponds to an interior
- point according to 'fillrule'.
+ ‘bool interior(int windingnumber, pen fillrule)’
+ returns true if ‘windingnumber’ corresponds to an interior
+ point according to ‘fillrule’.
- 'bool inside(path p, pair z, pen fillrule=currentpen);'
- returns 'true' iff the point 'z' lies inside or on the edge of
- the region bounded by the cyclic path 'p' according to the
- fill rule 'fillrule' (*note fillrule::).
+ ‘bool inside(path p, pair z, pen fillrule=currentpen);’
+ returns ‘true’ iff the point ‘z’ lies inside or on the edge of
+ the region bounded by the cyclic path ‘p’ according to the
+ fill rule ‘fillrule’ (*note fillrule::).
- 'int inside(path p, path q, pen fillrule=currentpen);'
- returns '1' if the cyclic path 'p' strictly contains 'q'
- according to the fill rule 'fillrule' (*note fillrule::), '-1'
- if the cyclic path 'q' strictly contains 'p', and '0'
+ ‘int inside(path p, path q, pen fillrule=currentpen);’
+ returns ‘1’ if the cyclic path ‘p’ strictly contains ‘q’
+ according to the fill rule ‘fillrule’ (*note fillrule::), ‘-1’
+ if the cyclic path ‘q’ strictly contains ‘p’, and ‘0’
otherwise.
- 'pair inside(path p, pen fillrule=currentpen);'
- returns an arbitrary point strictly inside a cyclic path 'p'
- according to the fill rule 'fillrule' (*note fillrule::).
+ ‘pair inside(path p, pen fillrule=currentpen);’
+ returns an arbitrary point strictly inside a cyclic path ‘p’
+ according to the fill rule ‘fillrule’ (*note fillrule::).
- 'path[] strokepath(path g, pen p=currentpen);'
- returns the path array that 'PostScript' would fill in drawing
- path 'g' with pen 'p'.
+ ‘path[] strokepath(path g, pen p=currentpen);’
+ returns the path array that ‘PostScript’ would fill in drawing
+ path ‘g’ with pen ‘p’.
-'guide'
+‘guide’
an unresolved cubic spline (list of cubic-spline nodes and control
- points). The implicit initializer for a guide is 'nullpath'; this
+ points). The implicit initializer for a guide is ‘nullpath’; this
is useful for building up a guide within a loop.
A guide is similar to a path except that the computation of the
@@ -2199,51 +2203,51 @@ File: asymptote.info, Node: Paths and guides, Next: Pens, Prev: Data types,
elements of a guide without actually resolving the guide to a fixed
path (except for internal cycles, which are resolved):
- 'int size(guide g);'
- Analogous to 'size(path p)'.
+ ‘int size(guide g);’
+ Analogous to ‘size(path p)’.
- 'int length(guide g);'
- Analogous to 'length(path p)'.
+ ‘int length(guide g);’
+ Analogous to ‘length(path p)’.
- 'bool cyclic(path p);'
- Analogous to 'cyclic(path p)'.
+ ‘bool cyclic(path p);’
+ Analogous to ‘cyclic(path p)’.
- 'pair point(guide g, int t);'
- Analogous to 'point(path p, int t)'.
+ ‘pair point(guide g, int t);’
+ Analogous to ‘point(path p, int t)’.
- 'guide reverse(guide g);'
- Analogous to 'reverse(path p)'. If 'g' is cyclic and also
+ ‘guide reverse(guide g);’
+ Analogous to ‘reverse(path p)’. If ‘g’ is cyclic and also
contains a secondary cycle, it is first solved to a path, then
- reversed. If 'g' is not cyclic but contains an internal
+ reversed. If ‘g’ is not cyclic but contains an internal
cycle, only the internal cycle is solved before reversal. If
there are no internal cycles, the guide is reversed but not
solved to a path.
- 'pair[] dirSpecifier(guide g, int i);'
+ ‘pair[] dirSpecifier(guide g, int i);’
This returns a pair array of length 2 containing the outgoing
(in element 0) and incoming (in element 1) direction
- specifiers (or '(0,0)' if none specified) for the segment of
- guide 'g' between nodes 'i' and 'i+1'.
+ specifiers (or ‘(0,0)’ if none specified) for the segment of
+ guide ‘g’ between nodes ‘i’ and ‘i+1’.
- 'pair[] controlSpecifier(guide g, int i);'
- If the segment of guide 'g' between nodes 'i' and 'i+1' has
+ ‘pair[] controlSpecifier(guide g, int i);’
+ If the segment of guide ‘g’ between nodes ‘i’ and ‘i+1’ has
explicit outgoing and incoming control points, they are
returned as elements 0 and 1, respectively, of a two-element
array. Otherwise, an empty array is returned.
- 'tensionSpecifier tensionSpecifier(guide g, int i);'
+ ‘tensionSpecifier tensionSpecifier(guide g, int i);’
This returns the tension specifier for the segment of guide
- 'g' between nodes 'i' and 'i+1'. The individual components of
- the 'tensionSpecifier' type can be accessed as the virtual
- members 'in', 'out', and 'atLeast'.
+ ‘g’ between nodes ‘i’ and ‘i+1’. The individual components of
+ the ‘tensionSpecifier’ type can be accessed as the virtual
+ members ‘in’, ‘out’, and ‘atLeast’.
- 'real[] curlSpecifier(guide g);'
+ ‘real[] curlSpecifier(guide g);’
This returns an array containing the initial curl specifier
(in element 0) and final curl specifier (in element 1) for
- guide 'g'.
+ guide ‘g’.
As a technical detail we note that a direction specifier given to
- 'nullpath' modifies the node on the other side: the guides
+ ‘nullpath’ modifies the node on the other side: the guides
a..{up}nullpath..b;
c..nullpath{up}..d;
e..{up}nullpath{down}..f;
@@ -2258,110 +2262,110 @@ File: asymptote.info, Node: Pens, Next: Transforms, Prev: Paths and guides,
6.3 Pens
========
-In 'Asymptote', pens provide a context for the four basic drawing
+In ‘Asymptote’, pens provide a context for the four basic drawing
commands (*note Drawing commands::). They are used to specify the
following drawing attributes: color, line type, line width, line cap,
line join, fill rule, text alignment, font, font size, pattern,
overwrite mode, and calligraphic transforms on the pen nib. The default
-pen used by the drawing routines is called 'currentpen'. This provides
-the same functionality as the 'MetaPost' command 'pickup'. The implicit
-initializer for pens is 'defaultpen'.
+pen used by the drawing routines is called ‘currentpen’. This provides
+the same functionality as the ‘MetaPost’ command ‘pickup’. The implicit
+initializer for pens is ‘defaultpen’.
Pens may be added together with the nonassociative binary operator
-'+'. This will add the colors of the two pens. All other non-default
+‘+’. This will add the colors of the two pens. All other non-default
attributes of the rightmost pen will override those of the leftmost pen.
-Thus, one can obtain a yellow dashed pen by saying 'dashed+red+green' or
-'red+green+dashed' or 'red+dashed+green'. The binary operator '*' can
+Thus, one can obtain a yellow dashed pen by saying ‘dashed+red+green’ or
+‘red+green+dashed’ or ‘red+dashed+green’. The binary operator ‘*’ can
be used to scale the color of a pen by a real number, until it saturates
with one or more color components equal to 1.
- * Colors are specified using one of the following colorspaces:
- 'pen gray(real g);'
- This produces a grayscale color, where the intensity 'g' lies
+ • Colors are specified using one of the following colorspaces:
+ ‘pen gray(real g);’
+ This produces a grayscale color, where the intensity ‘g’ lies
in the interval [0,1], with 0.0 denoting black and 1.0
denoting white.
- 'pen rgb(real r, real g, real b);'
+ ‘pen rgb(real r, real g, real b);’
This produces an RGB color, where each of the red, green, and
- blue intensities 'r', 'g', 'b', lies in the interval [0,1].
+ blue intensities ‘r’, ‘g’, ‘b’, lies in the interval [0,1].
- 'pen RGB(int r, int g, int b);'
+ ‘pen RGB(int r, int g, int b);’
This produces an RGB color, where each of the red, green, and
- blue intensities 'r', 'g', 'b', lies in the interval [0,255].
+ blue intensities ‘r’, ‘g’, ‘b’, lies in the interval [0,255].
- 'pen cmyk(real c, real m, real y, real k);'
+ ‘pen cmyk(real c, real m, real y, real k);’
This produces a CMYK color, where each of the cyan, magenta,
- yellow, and black intensities 'c', 'm', 'y', 'k', lies in the
+ yellow, and black intensities ‘c’, ‘m’, ‘y’, ‘k’, lies in the
interval [0,1].
- 'pen invisible;'
+ ‘pen invisible;’
This special pen writes in invisible ink, but adjusts the
bounding box as if something had been drawn (like the
- '\phantom' command in TeX). The function 'bool
- invisible(pen)' can be used to test whether a pen is
+ ‘\phantom’ command in TeX). The function ‘bool
+ invisible(pen)’ can be used to test whether a pen is
invisible.
- The default color is 'black'; this may be changed with the routine
- 'defaultpen(pen)'. The function 'colorspace(pen p)' returns the
- colorspace of pen 'p' as a string ('"gray"', '"rgb"', '"cmyk"', or
- '""').
+ The default color is ‘black’; this may be changed with the routine
+ ‘defaultpen(pen)’. The function ‘colorspace(pen p)’ returns the
+ colorspace of pen ‘p’ as a string (‘"gray"’, ‘"rgb"’, ‘"cmyk"’, or
+ ‘""’).
- The function 'real[] colors(pen)' returns the color components of a
- pen. The functions 'pen gray(pen)', 'pen rgb(pen)', and 'pen
- cmyk(pen)' return new pens obtained by converting their arguments
+ The function ‘real[] colors(pen)’ returns the color components of a
+ pen. The functions ‘pen gray(pen)’, ‘pen rgb(pen)’, and ‘pen
+ cmyk(pen)’ return new pens obtained by converting their arguments
to the respective color spaces. The function
- 'colorless(pen=currentpen)' returns a copy of its argument with the
+ ‘colorless(pen=currentpen)’ returns a copy of its argument with the
color attributes stripped (to avoid color mixing).
A 6-character RGB hexadecimal string can be converted to a pen with
the routine
pen rgb(string s);
- A pen can be converted to a hexadecimal string with
- * string hex(pen p);
+ • A pen can be converted to a hexadecimal string with ‘string hex(pen
+ p);’
- Various shades and mixtures of the grayscale primary colors 'black'
- and 'white', RGB primary colors 'red', 'green', and 'blue', and RGB
- secondary colors 'cyan', 'magenta', and 'yellow' are defined as
- named colors, along with the CMYK primary colors 'Cyan', 'Magenta',
- 'Yellow', and 'Black', in the module 'plain':
+ Various shades and mixtures of the grayscale primary colors ‘black’
+ and ‘white’, RGB primary colors ‘red’, ‘green’, and ‘blue’, and RGB
+ secondary colors ‘cyan’, ‘magenta’, and ‘yellow’ are defined as
+ named colors, along with the CMYK primary colors ‘Cyan’, ‘Magenta’,
+ ‘Yellow’, and ‘Black’, in the module ‘plain’:
[./colors]
- The standard 140 RGB 'X11' colors can be imported with the command
+ The standard 140 RGB ‘X11’ colors can be imported with the command
import x11colors;
and the standard 68 CMYK TeX colors can be imported with the
command
import texcolors;
Note that there is some overlap between these two standards and the
- definitions of some colors (e.g. 'Green') actually disagree.
+ definitions of some colors (e.g. ‘Green’) actually disagree.
- 'Asymptote' also comes with a 'asycolors.sty' 'LaTeX' package that
- defines to 'LaTeX' CMYK versions of 'Asymptote''s predefined
- colors, so that they can be used directly within 'LaTeX' strings.
- Normally, such colors are passed to 'LaTeX' via a pen argument;
+ ‘Asymptote’ also comes with a ‘asycolors.sty’ ‘LaTeX’ package that
+ defines to ‘LaTeX’ CMYK versions of ‘Asymptote’’s predefined
+ colors, so that they can be used directly within ‘LaTeX’ strings.
+ Normally, such colors are passed to ‘LaTeX’ via a pen argument;
however, to change the color of only a portion of a string, say for
a slide presentation, (*note slide::) it may be desirable to
- specify the color directly to 'LaTeX'. This file can be passed to
- 'LaTeX' with the 'Asymptote' command
+ specify the color directly to ‘LaTeX’. This file can be passed to
+ ‘LaTeX’ with the ‘Asymptote’ command
usepackage("asycolors");
- The structure 'hsv' defined in 'plain_pens.asy' may be used to
- convert between HSV and RGB spaces, where the hue 'h' is an angle
- in [0,360) and the saturation 's' and value 'v' lie in '[0,1]':
+ The structure ‘hsv’ defined in ‘plain_pens.asy’ may be used to
+ convert between HSV and RGB spaces, where the hue ‘h’ is an angle
+ in [0,360) and the saturation ‘s’ and value ‘v’ lie in ‘[0,1]’:
pen p=hsv(180,0.5,0.75);
write(p); // ([default], red=0.375, green=0.75, blue=0.75)
hsv q=p;
write(q.h,q.s,q.v); // 180 0.5 0.75
- * Line types are specified with the function 'pen linetype(real[] a,
- real offset=0, bool scale=true, bool adjust=true)', where 'a' is an
- array of real array numbers. The optional parameter 'offset'
+ • Line types are specified with the function ‘pen linetype(real[] a,
+ real offset=0, bool scale=true, bool adjust=true)’, where ‘a’ is an
+ array of real array numbers. The optional parameter ‘offset’
specifies where in the pattern to begin. The first number
- specifies how far (if 'scale' is 'true', in units of the pen line
- width; otherwise in 'PostScript' units) to draw with the pen on,
+ specifies how far (if ‘scale’ is ‘true’, in units of the pen line
+ width; otherwise in ‘PostScript’ units) to draw with the pen on,
the second number specifies how far to draw with the pen off, and
- so on. If 'adjust' is 'true', these spacings are automatically
- adjusted by 'Asymptote' to fit the arclength of the path. Here are
+ so on. If ‘adjust’ is ‘true’, these spacings are automatically
+ adjusted by ‘Asymptote’ to fit the arclength of the path. Here are
the predefined line types:
pen solid=linetype(new real[]);
pen dotted=linetype(new real[] {0,4});
@@ -2374,16 +2378,16 @@ with one or more color components equal to 1.
[./linetype]
- The default line type is 'solid'; this may be changed with
- 'defaultpen(pen)'. The line type of a pen can be determined with
- the functions 'real[] linetype(pen p=currentpen)', 'real offset(pen
- p)', 'bool scale(pen p)', and 'bool adjust(pen p)'.
+ The default line type is ‘solid’; this may be changed with
+ ‘defaultpen(pen)’. The line type of a pen can be determined with
+ the functions ‘real[] linetype(pen p=currentpen)’, ‘real offset(pen
+ p)’, ‘bool scale(pen p)’, and ‘bool adjust(pen p)’.
- * The pen line width is specified in 'PostScript' units with 'pen
- linewidth(real)'. The default line width is 0.5 bp; this value may
- be changed with 'defaultpen(pen)'. The line width of a pen is
- returned by 'real linewidth(pen p=currentpen)'. For convenience,
- in the module 'plain_pens' we define
+ • The pen line width is specified in ‘PostScript’ units with ‘pen
+ linewidth(real)’. The default line width is 0.5 bp; this value may
+ be changed with ‘defaultpen(pen)’. The line width of a pen is
+ returned by ‘real linewidth(pen p=currentpen)’. For convenience,
+ in the module ‘plain_pens’ we define
void defaultpen(real w) {defaultpen(linewidth(w));}
pen operator +(pen p, real w) {return p+linewidth(w);}
pen operator +(real w, pen p) {return linewidth(w)+p;}
@@ -2391,90 +2395,90 @@ with one or more color components equal to 1.
defaultpen(2);
pen p=red+0.5;
- * A pen with a specific 'PostScript' line cap is returned on calling
- 'linecap' with an integer argument:
+ • A pen with a specific ‘PostScript’ line cap is returned on calling
+ ‘linecap’ with an integer argument:
pen squarecap=linecap(0);
pen roundcap=linecap(1);
pen extendcap=linecap(2);
- The default line cap, 'roundcap', may be changed with
- 'defaultpen(pen)'. The line cap of a pen is returned by 'int
- linecap(pen p=currentpen)'.
+ The default line cap, ‘roundcap’, may be changed with
+ ‘defaultpen(pen)’. The line cap of a pen is returned by ‘int
+ linecap(pen p=currentpen)’.
- * A pen with a specific 'PostScript' join style is returned on
- calling 'linejoin' with an integer argument:
+ • A pen with a specific ‘PostScript’ join style is returned on
+ calling ‘linejoin’ with an integer argument:
pen miterjoin=linejoin(0);
pen roundjoin=linejoin(1);
pen beveljoin=linejoin(2);
- The default join style, 'roundjoin', may be changed with
- 'defaultpen(pen)'.The join style of a pen is returned by 'int
- linejoin(pen p=currentpen)'.
+ The default join style, ‘roundjoin’, may be changed with
+ ‘defaultpen(pen)’.The join style of a pen is returned by ‘int
+ linejoin(pen p=currentpen)’.
- * A pen with a specific 'PostScript' miter limit is returned by
- calling 'miterlimit(real)'. The default miterlimit, '10.0', may be
- changed with 'defaultpen(pen)'. The miter limit of a pen is
- returned by 'real miterlimit(pen p=currentpen)'.
+ • A pen with a specific ‘PostScript’ miter limit is returned by
+ calling ‘miterlimit(real)’. The default miterlimit, ‘10.0’, may be
+ changed with ‘defaultpen(pen)’. The miter limit of a pen is
+ returned by ‘real miterlimit(pen p=currentpen)’.
- * A pen with a specific 'PostScript' fill rule is returned on calling
- 'fillrule' with an integer argument:
+ • A pen with a specific ‘PostScript’ fill rule is returned on calling
+ ‘fillrule’ with an integer argument:
pen zerowinding=fillrule(0);
pen evenodd=fillrule(1);
The fill rule, which identifies the algorithm used to determine the
- insideness of a path or array of paths, only affects the 'clip',
- 'fill', and 'inside' functions. For the 'zerowinding' fill rule, a
- point 'z' is outside the region bounded by a path if the number of
+ insideness of a path or array of paths, only affects the ‘clip’,
+ ‘fill’, and ‘inside’ functions. For the ‘zerowinding’ fill rule, a
+ point ‘z’ is outside the region bounded by a path if the number of
upward intersections of the path with the horizontal line
- 'z--z+infinity' minus the number of downward intersections is zero.
- For the 'evenodd' fill rule, 'z' is considered to be outside the
+ ‘z--z+infinity’ minus the number of downward intersections is zero.
+ For the ‘evenodd’ fill rule, ‘z’ is considered to be outside the
region if the total number of such intersections is even. The
- default fill rule, 'zerowinding', may be changed with
- 'defaultpen(pen)'. The fill rule of a pen is returned by 'int
- fillrule(pen p=currentpen)'.
+ default fill rule, ‘zerowinding’, may be changed with
+ ‘defaultpen(pen)’. The fill rule of a pen is returned by ‘int
+ fillrule(pen p=currentpen)’.
- * A pen with a specific text alignment setting is returned on calling
- 'basealign' with an integer argument:
+ • A pen with a specific text alignment setting is returned on calling
+ ‘basealign’ with an integer argument:
pen nobasealign=basealign(0);
pen basealign=basealign(1);
- The default setting, 'nobasealign',which may be changed with
- 'defaultpen(pen)', causes the label alignment routines to use the
- full label bounding box for alignment. In contrast, 'basealign'
+ The default setting, ‘nobasealign’,which may be changed with
+ ‘defaultpen(pen)’, causes the label alignment routines to use the
+ full label bounding box for alignment. In contrast, ‘basealign’
requests that the TeX baseline be respected. The base align
- setting of a pen is returned by 'int basealign(pen p=currentpen)'.
+ setting of a pen is returned by ‘int basealign(pen p=currentpen)’.
- * The font size is specified in TeX points (1 pt = 1/72.27 inches)
- with the function 'pen fontsize(real size, real
- lineskip=1.2*size)'. The default font size, 12pt, may be changed
- with 'defaultpen(pen)'. Nonstandard font sizes may require
+ • The font size is specified in TeX points (1 pt = 1/72.27 inches)
+ with the function ‘pen fontsize(real size, real
+ lineskip=1.2*size)’. The default font size, 12pt, may be changed
+ with ‘defaultpen(pen)’. Nonstandard font sizes may require
inserting
import fontsize;
- at the beginning of the file (this requires the 'type1cm' package
+ at the beginning of the file (this requires the ‘type1cm’ package
available from
<http://mirror.ctan.org/macros/latex/contrib/type1cm/>
- and included in recent 'LaTeX' distributions). The font size and
- line skip of a pen can be examined with the routines 'real
- fontsize(pen p=currentpen)' and 'real lineskip(pen p=currentpen)',
+ and included in recent ‘LaTeX’ distributions). The font size and
+ line skip of a pen can be examined with the routines ‘real
+ fontsize(pen p=currentpen)’ and ‘real lineskip(pen p=currentpen)’,
respectively.
- * A pen using a specific LaTeX NFSS font is returned by calling the
- function 'pen font(string encoding, string family, string series,
- string shape)'. The default setting, 'font("OT1","cmr","m","n")',
+ • A pen using a specific LaTeX NFSS font is returned by calling the
+ function ‘pen font(string encoding, string family, string series,
+ string shape)’. The default setting, ‘font("OT1","cmr","m","n")’,
corresponds to 12pt Computer Modern Roman; this may be changed with
- 'defaultpen(pen)'. The font setting of a pen is returned by
- 'string font(pen p=currentpen)'.
+ ‘defaultpen(pen)’. The font setting of a pen is returned by
+ ‘string font(pen p=currentpen)’.
Alternatively, one may select a fixed-size TeX font (on which
- 'fontsize' has no effect) like '"cmr12"' (12pt Computer Modern
- Roman) or '"pcrr"' (Courier) using the function 'pen font(string
- name)'. An optional size argument can also be given to scale the
- font to the requested size: 'pen font(string name, real size)'.
+ ‘fontsize’ has no effect) like ‘"cmr12"’ (12pt Computer Modern
+ Roman) or ‘"pcrr"’ (Courier) using the function ‘pen font(string
+ name)’. An optional size argument can also be given to scale the
+ font to the requested size: ‘pen font(string name, real size)’.
- A nonstandard font command can be generated with 'pen
- fontcommand(string)'.
+ A nonstandard font command can be generated with ‘pen
+ fontcommand(string)’.
- A convenient interface to the following standard 'PostScript' fonts
+ A convenient interface to the following standard ‘PostScript’ fonts
is also provided:
pen AvantGarde(string series="m", string shape="n");
pen Bookman(string series="m", string shape="n");
@@ -2487,11 +2491,11 @@ with one or more color components equal to 1.
pen Symbol(string series="m", string shape="n");
pen ZapfDingbats(string series="m", string shape="n");
- * Starting with the 2018/04/01 release, LaTeX takes UTF-8 as the new
+ • Starting with the 2018/04/01 release, LaTeX takes UTF-8 as the new
default input encoding. However, you can still set different input
encoding (so as the font, font encoding or even language context).
- Here is an example for 'cp1251' and Russian language in Cyrillic
- script (font encoding 'T2A'):
+ Here is an example for ‘cp1251’ and Russian language in Cyrillic
+ script (font encoding ‘T2A’):
texpreamble("\usepackage[math]{anttor}");
texpreamble("\usepackage[T2A]{fontenc}");
texpreamble("\usepackage[cp1251]{inputenc}");
@@ -2501,43 +2505,43 @@ with one or more color components equal to 1.
<https://ctan.org/pkg/cjk>
The following commands enable the CJK song family (within a label,
you can also temporarily switch to another family, say kai, by
- prepending '"\CJKfamily{kai}"' to the label string):
+ prepending ‘"\CJKfamily{kai}"’ to the label string):
texpreamble("\usepackage{CJK}
\AtBeginDocument{\begin{CJK*}{GBK}{song}}
\AtEndDocument{\clearpage\end{CJK*}}");
- * The transparency of a pen can be changed with the command:
+ • The transparency of a pen can be changed with the command:
pen opacity(real opacity=1, string blend="Compatible");
- The opacity can be varied from '0' (fully transparent) to the
- default value of '1' (opaque), and 'blend' specifies one of the
- following foreground-background blending operations:
+ The opacity can be varied from ‘0’ (fully transparent) to the
+ default value of ‘1’ (opaque), and ‘blend’ specifies one of the
+ following foreground–background blending operations:
"Compatible","Normal","Multiply","Screen","Overlay","SoftLight",
"HardLight","ColorDodge","ColorBurn","Darken","Lighten","Difference",
"Exclusion","Hue","Saturation","Color","Luminosity",
as described in
<https://www.adobe.com/content/dam/acom/en/devnet/pdf/pdfs/PDF32000_2008.pdf>.
- Since 'PostScript' does not support transparency, this feature is
- only effective with the '-f pdf' output format option; other
+ Since ‘PostScript’ does not support transparency, this feature is
+ only effective with the ‘-f pdf’ output format option; other
formats can be produced from the resulting PDF file with the
- 'ImageMagick' 'convert' program. Labels are always drawn with an
- 'opacity' of 1. A simple example of transparent filling is
- provided in the example file 'transparency.asy'.
-
- * 'PostScript' commands within a 'picture' may be used to create a
- tiling pattern, identified by the string 'name', for 'fill' and
- 'draw' operations by adding it to the global 'PostScript' frame
- 'currentpatterns', with optional left-bottom margin 'lb' and
- right-top margin 'rt'.
+ ‘ImageMagick’ ‘convert’ program. Labels are always drawn with an
+ ‘opacity’ of 1. A simple example of transparent filling is
+ provided in the example file ‘transparency.asy’.
+
+ • ‘PostScript’ commands within a ‘picture’ may be used to create a
+ tiling pattern, identified by the string ‘name’, for ‘fill’ and
+ ‘draw’ operations by adding it to the global ‘PostScript’ frame
+ ‘currentpatterns’, with optional left-bottom margin ‘lb’ and
+ right-top margin ‘rt’.
import patterns;
void add(string name, picture pic, pair lb=0, pair rt=0);
- To 'fill' or 'draw' using pattern 'name', use the pen
- 'pattern("name")'. For example, rectangular tilings can be
- constructed using the routines 'picture tile(real Hx=5mm, real
- Hy=0, pen p=currentpen, filltype filltype=NoFill)', 'picture
- checker(real Hx=5mm, real Hy=0, pen p=currentpen)', and 'picture
- brick(real Hx=5mm, real Hy=0, pen p=currentpen)' defined in module
- 'patterns':
+ To ‘fill’ or ‘draw’ using pattern ‘name’, use the pen
+ ‘pattern("name")’. For example, rectangular tilings can be
+ constructed using the routines ‘picture tile(real Hx=5mm, real
+ Hy=0, pen p=currentpen, filltype filltype=NoFill)’, ‘picture
+ checker(real Hx=5mm, real Hy=0, pen p=currentpen)’, and ‘picture
+ brick(real Hx=5mm, real Hy=0, pen p=currentpen)’ defined in module
+ ‘patterns’:
size(0,90);
import patterns;
@@ -2554,9 +2558,9 @@ with one or more color components equal to 1.
[./tile]
- Hatch patterns can be generated with the routines 'picture
- hatch(real H=5mm, pair dir=NE, pen p=currentpen)', 'picture
- crosshatch(real H=5mm, pen p=currentpen)':
+ Hatch patterns can be generated with the routines ‘picture
+ hatch(real H=5mm, pair dir=NE, pen p=currentpen)’, ‘picture
+ crosshatch(real H=5mm, pen p=currentpen)’:
size(0,100);
import patterns;
@@ -2571,12 +2575,12 @@ with one or more color components equal to 1.
[./hatch]
- You may need to turn off aliasing in your 'PostScript' viewer for
+ You may need to turn off aliasing in your ‘PostScript’ viewer for
patterns to appear correctly. Custom patterns can easily be
- constructed, following the examples in module 'patterns'. The
+ constructed, following the examples in module ‘patterns’. The
tiled pattern can even incorporate shading (*note gradient
shading::), as illustrated in this example (not included in the
- manual because not all printers support 'PostScript' 3):
+ manual because not all printers support ‘PostScript’ 3):
size(0,100);
import patterns;
@@ -2590,10 +2594,10 @@ with one or more color components equal to 1.
filldraw(unitcircle,pattern("shadedtiling"));
- * One can specify a custom pen nib as an arbitrary polygonal path
- with 'pen makepen(path)'; this path represents the mark to be drawn
+ • One can specify a custom pen nib as an arbitrary polygonal path
+ with ‘pen makepen(path)’; this path represents the mark to be drawn
for paths containing a single point. This pen nib path can be
- recovered from a pen with 'path nib(pen)'. Unlike in 'MetaPost',
+ recovered from a pen with ‘path nib(pen)’. Unlike in ‘MetaPost’,
the path need not be convex:
size(200);
@@ -2608,39 +2612,39 @@ with one or more color components equal to 1.
[./makepen]
- The value 'nullpath' represents a circular pen nib (the default);
+ The value ‘nullpath’ represents a circular pen nib (the default);
an elliptical pen can be achieved simply by multiplying the pen by
- a transform: 'yscale(2)*currentpen'.
+ a transform: ‘yscale(2)*currentpen’.
- * One can prevent labels from overwriting one another by using the
- pen attribute 'overwrite', which takes a single argument:
+ • One can prevent labels from overwriting one another by using the
+ pen attribute ‘overwrite’, which takes a single argument:
- 'Allow'
+ ‘Allow’
Allow labels to overwrite one another. This is the default
- behaviour (unless overridden with 'defaultpen(pen)'.
+ behaviour (unless overridden with ‘defaultpen(pen)’.
- 'Suppress'
+ ‘Suppress’
Suppress, with a warning, each label that would overwrite
another label.
- 'SuppressQuiet'
+ ‘SuppressQuiet’
Suppress, without warning, each label that would overwrite
another label.
- 'Move'
+ ‘Move’
Move a label that would overwrite another out of the way and
issue a warning. As this adjustment is during the final
- output phase (in 'PostScript' coordinates) it could result in
+ output phase (in ‘PostScript’ coordinates) it could result in
a larger figure than requested.
- 'MoveQuiet'
+ ‘MoveQuiet’
Move a label that would overwrite another out of the way,
without warning. As this adjustment is during the final
- output phase (in 'PostScript' coordinates) it could result in
+ output phase (in ‘PostScript’ coordinates) it could result in
a larger figure than requested.
- The routine 'defaultpen()' returns the current default pen
-attributes. Calling the routine 'resetdefaultpen()' resets all pen
+ The routine ‘defaultpen()’ returns the current default pen
+attributes. Calling the routine ‘resetdefaultpen()’ resets all pen
default attributes to their initial values.

@@ -2649,51 +2653,51 @@ File: asymptote.info, Node: Transforms, Next: Frames and pictures, Prev: Pens
6.4 Transforms
==============
-'Asymptote' makes extensive use of affine transforms. A pair '(x,y)' is
-transformed by the transform 't=(t.x,t.y,t.xx,t.xy,t.yx,t.yy)' to
-'(x',y')', where
+‘Asymptote’ makes extensive use of affine transforms. A pair ‘(x,y)’ is
+transformed by the transform ‘t=(t.x,t.y,t.xx,t.xy,t.yx,t.yy)’ to
+‘(x',y')’, where
x' = t.x + t.xx * x + t.xy * y
y' = t.y + t.yx * x + t.yy * y
-This is equivalent to the 'PostScript' transformation '[t.xx t.yx t.xy
-t.yy t.x t.y]'.
+This is equivalent to the ‘PostScript’ transformation ‘[t.xx t.yx t.xy
+t.yy t.x t.y]’.
Transforms can be applied to pairs, guides, paths, pens, strings,
transforms, frames, and pictures by multiplication (via the binary
-operator '*') on the left (*note circle:: for an example). Transforms
+operator ‘*’) on the left (*note circle:: for an example). Transforms
can be composed with one another and inverted with the function
-'transform inverse(transform t)'; they can also be raised to any integer
-power with the '^' operator.
+‘transform inverse(transform t)’; they can also be raised to any integer
+power with the ‘^’ operator.
The built-in transforms are:
-'transform identity;'
+‘transform identity;’
the identity transform;
-'transform shift(pair z);'
- translates by the pair 'z';
-'transform shift(real x, real y);'
- translates by the pair '(x,y)';
-'transform xscale(real x);'
- scales by 'x' in the x direction;
-'transform yscale(real y);'
- scales by 'y' in the y direction;
-'transform scale(real s);'
- scale by 's' in both x and y directions;
-'transform scale(real x, real y);'
- scale by 'x' in the x direction and by 'y' in the y direction;
-'transform slant(real s);'
- maps '(x,y)' -> '(x+s*y,y)';
-'transform rotate(real angle, pair z=(0,0));'
- rotates by 'angle' in degrees about 'z';
-'transform reflect(pair a, pair b);'
- reflects about the line 'a--b'.
-'transform zeroTransform;'
+‘transform shift(pair z);’
+ translates by the pair ‘z’;
+‘transform shift(real x, real y);’
+ translates by the pair ‘(x,y)’;
+‘transform xscale(real x);’
+ scales by ‘x’ in the x direction;
+‘transform yscale(real y);’
+ scales by ‘y’ in the y direction;
+‘transform scale(real s);’
+ scale by ‘s’ in both x and y directions;
+‘transform scale(real x, real y);’
+ scale by ‘x’ in the x direction and by ‘y’ in the y direction;
+‘transform slant(real s);’
+ maps ‘(x,y)’ –> ‘(x+s*y,y)’;
+‘transform rotate(real angle, pair z=(0,0));’
+ rotates by ‘angle’ in degrees about ‘z’;
+‘transform reflect(pair a, pair b);’
+ reflects about the line ‘a--b’.
+‘transform zeroTransform;’
the zero transform;
- The implicit initializer for transforms is 'identity()'. The
-routines 'shift(transform t)' and 'shiftless(transform t)' return the
-transforms '(t.x,t.y,0,0,0,0)' and '(0,0,t.xx,t.xy,t.yx,t.yy)'
-respectively. The function 'bool isometry(transform t)' can be used to
-test if 't' is an isometry (preserves distance).
+ The implicit initializer for transforms is ‘identity()’. The
+routines ‘shift(transform t)’ and ‘shiftless(transform t)’ return the
+transforms ‘(t.x,t.y,0,0,0,0)’ and ‘(0,0,t.xx,t.xy,t.yx,t.yy)’
+respectively. The function ‘bool isometry(transform t)’ can be used to
+test if ‘t’ is an isometry (preserves distance).

File: asymptote.info, Node: Frames and pictures, Next: Files, Prev: Transforms, Up: Programming
@@ -2701,27 +2705,27 @@ File: asymptote.info, Node: Frames and pictures, Next: Files, Prev: Transform
6.5 Frames and pictures
=======================
-'frame'
- Frames are canvases for drawing in 'PostScript' coordinates. While
+‘frame’
+ Frames are canvases for drawing in ‘PostScript’ coordinates. While
working with frames directly is occasionally necessary for
constructing deferred drawing routines, pictures are usually more
convenient to work with. The implicit initializer for frames is
- 'newframe'. The function 'bool empty(frame f)' returns 'true' only
- if the frame 'f' is empty. A frame may be erased with the
- 'erase(frame)' routine. The functions 'pair min(frame)' and 'pair
- max(frame)' return the (left,bottom) and (right,top) coordinates of
- the frame bounding box, respectively. The contents of frame 'src'
- may be appended to frame 'dest' with the command
+ ‘newframe’. The function ‘bool empty(frame f)’ returns ‘true’ only
+ if the frame ‘f’ is empty. A frame may be erased with the
+ ‘erase(frame)’ routine. The functions ‘pair min(frame)’ and ‘pair
+ max(frame)’ return the (left,bottom) and (right,top) coordinates of
+ the frame bounding box, respectively. The contents of frame ‘src’
+ may be appended to frame ‘dest’ with the command
void add(frame dest, frame src);
or prepended with
void prepend(frame dest, frame src);
- A frame obtained by aligning frame 'f' in the direction 'align', in
- a manner analogous to the 'align' argument of 'label' (*note
+ A frame obtained by aligning frame ‘f’ in the direction ‘align’, in
+ a manner analogous to the ‘align’ argument of ‘label’ (*note
label::), is returned by
frame align(frame f, pair align);
To draw or fill a box or ellipse around a label or frame and return
- the boundary as a path, use one of the predefined 'envelope'
+ the boundary as a path, use one of the predefined ‘envelope’
routines
path box(frame f, Label L="", real xmargin=0,
real ymargin=xmargin, pen p=currentpen,
@@ -2733,92 +2737,92 @@ File: asymptote.info, Node: Frames and pictures, Next: Files, Prev: Transform
real ymargin=xmargin, pen p=currentpen,
filltype filltype=NoFill, bool above=true);
-'picture'
+‘picture’
Pictures are high-level structures (*note Structures::) defined in
- the module 'plain' that provide canvases for drawing in user
- coordinates. The default picture is called 'currentpicture'. A
+ the module ‘plain’ that provide canvases for drawing in user
+ coordinates. The default picture is called ‘currentpicture’. A
new picture can be created like this:
picture pic;
- Anonymous pictures can be made by the expression 'new picture'.
+ Anonymous pictures can be made by the expression ‘new picture’.
- The 'size' routine specifies the dimensions of the desired picture:
+ The ‘size’ routine specifies the dimensions of the desired picture:
void size(picture pic=currentpicture, real x, real y=x,
bool keepAspect=Aspect);
- If the 'x' and 'y' sizes are both 0, user coordinates will be
- interpreted as 'PostScript' coordinates. In this case, the
- transform mapping 'pic' to the final output frame is 'identity()'.
+ If the ‘x’ and ‘y’ sizes are both 0, user coordinates will be
+ interpreted as ‘PostScript’ coordinates. In this case, the
+ transform mapping ‘pic’ to the final output frame is ‘identity()’.
- If exactly one of 'x' or 'y' is 0, no size restriction is imposed
+ If exactly one of ‘x’ or ‘y’ is 0, no size restriction is imposed
in that direction; it will be scaled the same as the other
direction.
- If 'keepAspect' is set to 'Aspect' or 'true', the picture will be
+ If ‘keepAspect’ is set to ‘Aspect’ or ‘true’, the picture will be
scaled with its aspect ratio preserved such that the final width is
- no more than 'x' and the final height is no more than 'y'.
+ no more than ‘x’ and the final height is no more than ‘y’.
- If 'keepAspect' is set to 'IgnoreAspect' or 'false', the picture
- will be scaled in both directions so that the final width is 'x'
- and the height is 'y'.
+ If ‘keepAspect’ is set to ‘IgnoreAspect’ or ‘false’, the picture
+ will be scaled in both directions so that the final width is ‘x’
+ and the height is ‘y’.
- To make the user coordinates of picture 'pic' represent multiples
- of 'x' units in the x direction and 'y' units in the y direction,
+ To make the user coordinates of picture ‘pic’ represent multiples
+ of ‘x’ units in the x direction and ‘y’ units in the y direction,
use
void unitsize(picture pic=currentpicture, real x, real y=x);
- When nonzero, these 'x' and 'y' values override the corresponding
- size parameters of picture 'pic'.
+ When nonzero, these ‘x’ and ‘y’ values override the corresponding
+ size parameters of picture ‘pic’.
The routine
void size(picture pic=currentpicture, real xsize, real ysize,
pair min, pair max);
forces the final picture scaling to map the user coordinates
- 'box(min,max)' to a region of width 'xsize' and height 'ysize'
+ ‘box(min,max)’ to a region of width ‘xsize’ and height ‘ysize’
(when these parameters are nonzero).
Alternatively, calling the routine
transform fixedscaling(picture pic=currentpicture, pair min,
pair max, pen p=nullpen, bool warn=false);
- will cause picture 'pic' to use a fixed scaling to map user
- coordinates in 'box(min,max)' to the (already specified) picture
- size, taking account of the width of pen 'p'. A warning will be
+ will cause picture ‘pic’ to use a fixed scaling to map user
+ coordinates in ‘box(min,max)’ to the (already specified) picture
+ size, taking account of the width of pen ‘p’. A warning will be
issued if the final picture exceeds the specified size.
- A picture 'pic' can be fit to a frame and output to a file
- 'prefix'.'format' using image format 'format' by calling the
- 'shipout' function:
+ A picture ‘pic’ can be fit to a frame and output to a file
+ ‘prefix’.‘format’ using image format ‘format’ by calling the
+ ‘shipout’ function:
void shipout(string prefix=defaultfilename, picture pic=currentpicture,
orientation orientation=orientation,
string format="", bool wait=false, bool view=true,
string options="", string script="",
light light=currentlight, projection P=currentprojection)
- The default output format, 'PostScript', may be changed with the
- '-f' or '-tex' command-line options. The 'options', 'script', and
- 'projection' parameters are only relevant for 3D pictures. If
- 'defaultfilename' is an empty string, the prefix 'outprefix()' will
+ The default output format, ‘PostScript’, may be changed with the
+ ‘-f’ or ‘-tex’ command-line options. The ‘options’, ‘script’, and
+ ‘projection’ parameters are only relevant for 3D pictures. If
+ ‘defaultfilename’ is an empty string, the prefix ‘outprefix()’ will
be used.
- A 'shipout()' command is added implicitly at file exit if no
- previous 'shipout' commands have been executed. The default page
- orientation is 'Portrait'; this may be modified by changing the
- variable 'orientation'. To output in landscape mode, simply set
- the variable 'orientation=Landscape' or issue the command
+ A ‘shipout()’ command is added implicitly at file exit. The
+ default page orientation is ‘Portrait’; this may be modified by
+ changing the variable ‘orientation’. To output in landscape mode,
+ simply set the variable ‘orientation=Landscape’ or issue the
+ command
shipout(Landscape);
- To rotate the page by -90 degrees, use the orientation 'Seascape'.
- The orientation 'UpsideDown' rotates the page by 180 degrees.
+ To rotate the page by -90 degrees, use the orientation ‘Seascape’.
+ The orientation ‘UpsideDown’ rotates the page by 180 degrees.
- A picture 'pic' can be explicitly fit to a frame by calling
+ A picture ‘pic’ can be explicitly fit to a frame by calling
frame pic.fit(real xsize=pic.xsize, real ysize=pic.ysize,
bool keepAspect=pic.keepAspect);
The default size and aspect ratio settings are those given to the
- 'size' command (which default to '0', '0', and 'true',
+ ‘size’ command (which default to ‘0’, ‘0’, and ‘true’,
respectively). The transformation that would currently be used to
- fit a picture 'pic' to a frame is returned by the member function
- 'pic.calculateTransform()'.
+ fit a picture ‘pic’ to a frame is returned by the member function
+ ‘pic.calculateTransform()’.
In certain cases (e.g. 2D graphs) where only an approximate size
- estimate for 'pic' is available, the picture fitting routine
+ estimate for ‘pic’ is available, the picture fitting routine
frame pic.scale(real xsize=this.xsize, real ysize=this.ysize,
bool keepAspect=this.keepAspect);
(which scales the resulting frame, including labels and fixed-size
@@ -2830,56 +2834,56 @@ File: asymptote.info, Node: Frames and pictures, Next: Files, Prev: Transform
frame bbox(picture pic=currentpicture, real xmargin=0,
real ymargin=xmargin, pen p=currentpen,
filltype filltype=NoFill);
- Here 'filltype' specifies one of the following fill types:
- 'FillDraw'
+ Here ‘filltype’ specifies one of the following fill types:
+ ‘FillDraw’
Fill the interior and draw the boundary.
- 'FillDraw(real xmargin=0, real ymargin=xmargin, pen fillpen=nullpen,'
- 'pen drawpen=nullpen)' If 'fillpen' is 'nullpen', fill with
- the drawing pen; otherwise fill with pen 'fillpen'. If
- 'drawpen' is 'nullpen', draw the boundary with 'fillpen';
- otherwise with 'drawpen'. An optional margin of 'xmargin' and
- 'ymargin' can be specified.
+ ‘FillDraw(real xmargin=0, real ymargin=xmargin, pen fillpen=nullpen,’
+ ‘pen drawpen=nullpen)’ If ‘fillpen’ is ‘nullpen’, fill with
+ the drawing pen; otherwise fill with pen ‘fillpen’. If
+ ‘drawpen’ is ‘nullpen’, draw the boundary with ‘fillpen’;
+ otherwise with ‘drawpen’. An optional margin of ‘xmargin’ and
+ ‘ymargin’ can be specified.
- 'Fill'
+ ‘Fill’
Fill the interior.
- 'Fill(real xmargin=0, real ymargin=xmargin, pen p=nullpen)'
- If 'p' is 'nullpen', fill with the drawing pen; otherwise fill
- with pen 'p'. An optional margin of 'xmargin' and 'ymargin'
+ ‘Fill(real xmargin=0, real ymargin=xmargin, pen p=nullpen)’
+ If ‘p’ is ‘nullpen’, fill with the drawing pen; otherwise fill
+ with pen ‘p’. An optional margin of ‘xmargin’ and ‘ymargin’
can be specified.
- 'NoFill'
+ ‘NoFill’
Do not fill.
- 'Draw'
+ ‘Draw’
Draw only the boundary.
- 'Draw(real xmargin=0, real ymargin=xmargin, pen p=nullpen)'
- If 'p' is 'nullpen', draw the boundary with the drawing pen;
- otherwise draw with pen 'p'. An optional margin of 'xmargin'
- and 'ymargin' can be specified.
+ ‘Draw(real xmargin=0, real ymargin=xmargin, pen p=nullpen)’
+ If ‘p’ is ‘nullpen’, draw the boundary with the drawing pen;
+ otherwise draw with pen ‘p’. An optional margin of ‘xmargin’
+ and ‘ymargin’ can be specified.
- 'UnFill'
+ ‘UnFill’
Clip the region.
- 'UnFill(real xmargin=0, real ymargin=xmargin)'
- Clip the region and surrounding margins 'xmargin' and
- 'ymargin'.
+ ‘UnFill(real xmargin=0, real ymargin=xmargin)’
+ Clip the region and surrounding margins ‘xmargin’ and
+ ‘ymargin’.
- 'RadialShade(pen penc, pen penr)'
- Fill varying radially from 'penc' at the center of the
- bounding box to 'penr' at the edge.
+ ‘RadialShade(pen penc, pen penr)’
+ Fill varying radially from ‘penc’ at the center of the
+ bounding box to ‘penr’ at the edge.
- 'RadialShadeDraw(real xmargin=0, real ymargin=xmargin, pen penc,'
- 'pen penr, pen drawpen=nullpen)' Fill with RadialShade and
+ ‘RadialShadeDraw(real xmargin=0, real ymargin=xmargin, pen penc,’
+ ‘pen penr, pen drawpen=nullpen)’ Fill with RadialShade and
draw the boundary.
For example, to draw a bounding box around a picture with a 0.25 cm
margin and output the resulting frame, use the command:
shipout(bbox(0.25cm));
- A 'picture' may be fit to a frame with the background color pen
- 'p', using the function 'bbox(p,Fill)'.
+ A ‘picture’ may be fit to a frame with the background color pen
+ ‘p’, using the function ‘bbox(p,Fill)’.
To pad a picture to a precise size in both directions, fit the
picture to a frame using the function
@@ -2890,43 +2894,43 @@ File: asymptote.info, Node: Frames and pictures, Next: Files, Prev: Transform
pair min(picture pic, user=false);
pair max(picture pic, user=false);
pair size(picture pic, user=false);
- calculate the bounds that picture 'pic' would have if it were
+ calculate the bounds that picture ‘pic’ would have if it were
currently fit to a frame using its default size specification. If
- 'user' is 'false' the returned value is in 'PostScript'
+ ‘user’ is ‘false’ the returned value is in ‘PostScript’
coordinates, otherwise it is in user coordinates.
The function
pair point(picture pic=currentpicture, pair dir, bool user=true);
is a convenient way of determining the point on the bounding box of
- 'pic' in the direction 'dir' relative to its center, ignoring the
+ ‘pic’ in the direction ‘dir’ relative to its center, ignoring the
contributions from fixed-size objects (such as labels and
- arrowheads). If 'user' is 'true' the returned value is in user
- coordinates, otherwise it is in 'PostScript' coordinates.
+ arrowheads). If ‘user’ is ‘true’ the returned value is in user
+ coordinates, otherwise it is in ‘PostScript’ coordinates.
The function
pair truepoint(picture pic=currentpicture, pair dir, bool user=true);
- is identical to 'point', except that it also accounts for
- fixed-size objects, using the scaling transform that picture 'pic'
+ is identical to ‘point’, except that it also accounts for
+ fixed-size objects, using the scaling transform that picture ‘pic’
would have if currently fit to a frame using its default size
- specification. If 'user' is 'true' the returned value is in user
- coordinates, otherwise it is in 'PostScript' coordinates.
+ specification. If ‘user’ is ‘true’ the returned value is in user
+ coordinates, otherwise it is in ‘PostScript’ coordinates.
Sometimes it is useful to draw objects on separate pictures and add
- one picture to another using the 'add' function:
+ one picture to another using the ‘add’ function:
void add(picture src, bool group=true,
filltype filltype=NoFill, bool above=true);
void add(picture dest, picture src, bool group=true,
filltype filltype=NoFill, bool above=true);
- The first example adds 'src' to 'currentpicture'; the second one
- adds 'src' to 'dest'. The 'group' option specifies whether or not
+ The first example adds ‘src’ to ‘currentpicture’; the second one
+ adds ‘src’ to ‘dest’. The ‘group’ option specifies whether or not
the graphical user interface should treat all of the elements of
- 'src' as a single entity (*note GUI::), 'filltype' requests
- optional background filling or clipping, and 'above' specifies
- whether to add 'src' above or below existing objects.
+ ‘src’ as a single entity (*note GUI::), ‘filltype’ requests
+ optional background filling or clipping, and ‘above’ specifies
+ whether to add ‘src’ above or below existing objects.
- There are also routines to add a picture or frame 'src' specified
- in postscript coordinates to another picture 'dest' (or
- 'currentpicture') about the user coordinate 'position':
+ There are also routines to add a picture or frame ‘src’ specified
+ in postscript coordinates to another picture ‘dest’ (or
+ ‘currentpicture’) about the user coordinate ‘position’:
void add(picture src, pair position, bool group=true,
filltype filltype=NoFill, bool above=true);
void add(picture dest, picture src, pair position,
@@ -2937,12 +2941,12 @@ File: asymptote.info, Node: Frames and pictures, Next: Files, Prev: Transform
pair align, bool group=true, filltype filltype=NoFill,
bool above=true);
- The optional 'align' argument in the last form specifies a
+ The optional ‘align’ argument in the last form specifies a
direction to use for aligning the frame, in a manner analogous to
- the 'align' argument of 'label' (*note label::). However, one key
- difference is that when 'align' is not specified, labels are
+ the ‘align’ argument of ‘label’ (*note label::). However, one key
+ difference is that when ‘align’ is not specified, labels are
centered, whereas frames and pictures are aligned so that their
- origin is at 'position'. Illustrations of frame alignment can be
+ origin is at ‘position’. Illustrations of frame alignment can be
found in the examples *note errorbars:: and *note image::. If you
want to align three or more subpictures, group them two at a time:
@@ -2969,9 +2973,9 @@ File: asymptote.info, Node: Frames and pictures, Next: Files, Prev: Transform
[./subpictures]
- Alternatively, one can use 'attach' to automatically increase the
- size of picture 'dest' to accommodate adding a frame 'src' about
- the user coordinate 'position':
+ Alternatively, one can use ‘attach’ to automatically increase the
+ size of picture ‘dest’ to accommodate adding a frame ‘src’ about
+ the user coordinate ‘position’:
void attach(picture dest=currentpicture, frame src,
pair position=0, bool group=true,
filltype filltype=NoFill, bool above=true);
@@ -2983,28 +2987,28 @@ File: asymptote.info, Node: Frames and pictures, Next: Files, Prev: Transform
specification), use the function
void erase(picture pic=currentpicture);
- To save a snapshot of 'currentpicture', 'currentpen', and
- 'currentprojection', use the function 'save()'.
+ To save a snapshot of ‘currentpicture’, ‘currentpen’, and
+ ‘currentprojection’, use the function ‘save()’.
- To restore a snapshot of 'currentpicture', 'currentpen', and
- 'currentprojection', use the function 'restore()'.
+ To restore a snapshot of ‘currentpicture’, ‘currentpen’, and
+ ‘currentprojection’, use the function ‘restore()’.
Many further examples of picture and frame operations are provided
- in the base module 'plain'.
+ in the base module ‘plain’.
- It is possible to insert verbatim 'PostScript' commands in a
+ It is possible to insert verbatim ‘PostScript’ commands in a
picture with one of the routines
void postscript(picture pic=currentpicture, string s);
void postscript(picture pic=currentpicture, string s, pair min,
pair max)
- Here 'min' and 'max' can be used to specify explicit bounds
- associated with the resulting 'PostScript' code.
+ Here ‘min’ and ‘max’ can be used to specify explicit bounds
+ associated with the resulting ‘PostScript’ code.
- Verbatim TeX commands can be inserted in the intermediate 'LaTeX'
+ Verbatim TeX commands can be inserted in the intermediate ‘LaTeX’
output file with one of the functions
void tex(picture pic=currentpicture, string s);
void tex(picture pic=currentpicture, string s, pair min, pair max)
- Here 'min' and 'max' can be used to specify explicit bounds
+ Here ‘min’ and ‘max’ can be used to specify explicit bounds
associated with the resulting TeX code.
To issue a global TeX command (such as a TeX macro definition) in
@@ -3020,7 +3024,7 @@ File: asymptote.info, Node: Frames and pictures, Next: Files, Prev: Transform
void usepackage(string s, string options="");
provides a convenient abbreviation for
texpreamble("\usepackage["+options+"]{"+s+"}");
- that can be used for importing 'LaTeX' packages.
+ that can be used for importing ‘LaTeX’ packages.

File: asymptote.info, Node: Files, Next: Variable initializers, Prev: Frames and pictures, Up: Programming
@@ -3028,7 +3032,7 @@ File: asymptote.info, Node: Files, Next: Variable initializers, Prev: Frames
6.6 Files
=========
-'Asymptote' can read and write text files (including comma-separated
+‘Asymptote’ can read and write text files (including comma-separated
value) files and portable XDR (External Data Representation) binary
files.
@@ -3038,47 +3042,47 @@ input(string name="", bool check=true, string comment="#", string mode="");
file fin=input("test.txt");
real a=fin;
- If the optional boolean argument 'check' is 'false', no check will be
+ If the optional boolean argument ‘check’ is ‘false’, no check will be
made that the file exists. If the file does not exist or is not
-readable, the function 'bool error(file)' will return 'true'. The first
-character of the string 'comment' specifies a comment character. If
+readable, the function ‘bool error(file)’ will return ‘true’. The first
+character of the string ‘comment’ specifies a comment character. If
this character is encountered in a data file, the remainder of the line
is ignored. When reading strings, a comment character followed
immediately by another comment character is treated as a single literal
-comment character. If 'Asymptote' is compiled with support for
-'libcurl', 'name' can be a URL.
+comment character. If ‘Asymptote’ is compiled with support for
+‘libcurl’, ‘name’ can be a URL.
- Unless the '-noglobalread' command-line option is specified, one can
+ Unless the ‘-noglobalread’ command-line option is specified, one can
change the current working directory for read operations to the contents
-of the string 's' with the function 'string cd(string s)', which returns
-the new working directory. If 'string s' is empty, the path is reset to
+of the string ‘s’ with the function ‘string cd(string s)’, which returns
+the new working directory. If ‘string s’ is empty, the path is reset to
the value it had at program startup.
When reading pairs, the enclosing parenthesis are optional. Strings
are also read by assignment, by reading characters up to but not
-including a newline. In addition, 'Asymptote' provides the function
-'string getc(file)' to read the next character (treating the comment
+including a newline. In addition, ‘Asymptote’ provides the function
+‘string getc(file)’ to read the next character (treating the comment
character as an ordinary character) and return it as a string.
- A file named 'name' can be open for output with
+ A file named ‘name’ can be open for output with
file output(string name="", bool update=false, string comment="#", string mode="");
-If 'update=false', any existing data in the file will be erased and only
-write operations can be used on the file. If 'update=true', any
+If ‘update=false’, any existing data in the file will be erased and only
+write operations can be used on the file. If ‘update=true’, any
existing data will be preserved, the position will be set to the
end-of-file, and both reading and writing operations will be enabled.
For security reasons, writing to files in directories other than the
-current directory is allowed only if the '-globalwrite' (or '-nosafe')
+current directory is allowed only if the ‘-globalwrite’ (or ‘-nosafe’)
command-line option is specified. Reading from files in other
-directories is allowed unless the '-noglobalread' command-line option is
-specified. The function 'string mktemp(string s)' may be used to create
+directories is allowed unless the ‘-noglobalread’ command-line option is
+specified. The function ‘string mktemp(string s)’ may be used to create
and return the name of a unique temporary file in the current directory
-based on the string 's'.
+based on the string ‘s’.
- There are two special files: 'stdin', which reads from the keyboard,
-and 'stdout', which writes to the terminal. The implicit initializer
-for files is 'null'.
+ There are two special files: ‘stdin’, which reads from the keyboard,
+and ‘stdout’, which writes to the terminal. The implicit initializer
+for files is ‘null’.
- Data of a built-in type 'T' can be written to an output file by
+ Data of a built-in type ‘T’ can be written to an output file by
calling one of the functions
write(string s="", T x, suffix suffix=endl ... T[]);
write(file file, string s="", T x, suffix suffix=none ... T[]);
@@ -3087,61 +3091,61 @@ write(file file=stdout, T[][]);
write(file file=stdout, T[][][]);
write(suffix suffix=endl);
write(file file, suffix suffix=none);
- If 'file' is not specified, 'stdout' is used and terminated by
+ If ‘file’ is not specified, ‘stdout’ is used and terminated by
default with a newline. If specified, the optional identifying string
-'s' is written before the data 'x'. An arbitrary number of data values
+‘s’ is written before the data ‘x’. An arbitrary number of data values
may be listed when writing scalars or one-dimensional arrays. The
-'suffix' may be one of the following: 'none' (do nothing), 'flush'
-(output buffered data), 'endl' (terminate with a newline and flush),
-'newl' (terminate with a newline), 'DOSendl' (terminate with a DOS
-newline and flush), 'DOSnewl' (terminate with a DOS newline), 'tab'
-(terminate with a tab), or 'comma' (terminate with a comma). Here are
+‘suffix’ may be one of the following: ‘none’ (do nothing), ‘flush’
+(output buffered data), ‘endl’ (terminate with a newline and flush),
+‘newl’ (terminate with a newline), ‘DOSendl’ (terminate with a DOS
+newline and flush), ‘DOSnewl’ (terminate with a DOS newline), ‘tab’
+(terminate with a tab), or ‘comma’ (terminate with a comma). Here are
some simple examples of data output:
file fout=output("test.txt");
write(fout,1); // Writes "1"
write(fout); // Writes a new line
write(fout,"List: ",1,2,3); // Writes "List: 1 2 3"
- A file may be opened with 'mode="xdr"', to read or write double
+ A file may be opened with ‘mode="xdr"’, to read or write double
precision (64-bit) reals and single precision (32-bit) integers in Sun
-Microsystem's XDR (External Data Representation) portable binary format
-(available on all 'UNIX' platforms). Alternatively, a file may also be
-opened with 'mode="binary"' to read or write double precision reals and
+Microsystem’s XDR (External Data Representation) portable binary format
+(available on all ‘UNIX’ platforms). Alternatively, a file may also be
+opened with ‘mode="binary"’ to read or write double precision reals and
single precision integers in the native (nonportable) machine binary
format, or to read the entire file into a string. The virtual member
-functions 'file singlereal(bool b=true)' and 'file singleint(bool
-b=true)' be used to change the precision of real and integer I/O
-operations, respectively, for an XDR or binary file 'f'. Similarly, the
-function 'file signedint(bool b=true)' can be used to modify the
-signedness of integer reads and writes for an XDR or binary file 'f'.
-
- The virtual members 'name', 'mode', 'singlereal', 'singleint', and
-'signedint' may be used to query the respective parameters for a given
+functions ‘file singlereal(bool b=true)’ and ‘file singleint(bool
+b=true)’ be used to change the precision of real and integer I/O
+operations, respectively, for an XDR or binary file ‘f’. Similarly, the
+function ‘file signedint(bool b=true)’ can be used to modify the
+signedness of integer reads and writes for an XDR or binary file ‘f’.
+
+ The virtual members ‘name’, ‘mode’, ‘singlereal’, ‘singleint’, and
+‘signedint’ may be used to query the respective parameters for a given
file.
One can test a file for end-of-file with the boolean function
-'eof(file)', end-of-line with 'eol(file)', and for I/O errors with
-'error(file)'. One can flush the output buffers with 'flush(file)',
-clear a previous I/O error with 'clear(file)', and close the file with
-'close(file)'. The function 'int precision(file file=stdout, int
-digits=0)' sets the number of digits of output precision for 'file' to
-'digits', provided 'digits' is nonzero, and returns the previous
-precision setting. The function 'int tell(file)' returns the current
-position in a file relative to the beginning. The routine 'seek(file
-file, int pos)' can be used to change this position, where a negative
-value for the position 'pos' is interpreted as relative to the
-end-of-file. For example, one can rewind a file 'file' with the command
-'seek(file,0)' and position to the final character in the file with
-'seek(file,-1)'. The command 'seekeof(file)' sets the position to the
+‘eof(file)’, end-of-line with ‘eol(file)’, and for I/O errors with
+‘error(file)’. One can flush the output buffers with ‘flush(file)’,
+clear a previous I/O error with ‘clear(file)’, and close the file with
+‘close(file)’. The function ‘int precision(file file=stdout, int
+digits=0)’ sets the number of digits of output precision for ‘file’ to
+‘digits’, provided ‘digits’ is nonzero, and returns the previous
+precision setting. The function ‘int tell(file)’ returns the current
+position in a file relative to the beginning. The routine ‘seek(file
+file, int pos)’ can be used to change this position, where a negative
+value for the position ‘pos’ is interpreted as relative to the
+end-of-file. For example, one can rewind a file ‘file’ with the command
+‘seek(file,0)’ and position to the final character in the file with
+‘seek(file,-1)’. The command ‘seekeof(file)’ sets the position to the
end of the file.
- Assigning 'settings.scroll=n' for a positive integer 'n' requests a
-pause after every 'n' output lines to 'stdout'. One may then press
-'Enter' to continue to the next 'n' output lines, 's' followed by
-'Enter' to scroll without further interruption, or 'q' followed by
-'Enter' to quit the current output operation. If 'n' is negative, the
+ Assigning ‘settings.scroll=n’ for a positive integer ‘n’ requests a
+pause after every ‘n’ output lines to ‘stdout’. One may then press
+‘Enter’ to continue to the next ‘n’ output lines, ‘s’ followed by
+‘Enter’ to scroll without further interruption, or ‘q’ followed by
+‘Enter’ to quit the current output operation. If ‘n’ is negative, the
output scrolls a page at a time (i.e. by one less than the current
-number of display lines). The default value, 'settings.scroll=0',
+number of display lines). The default value, ‘settings.scroll=0’,
specifies continuous scrolling.
The routines
@@ -3155,38 +3159,38 @@ pair getpair(string name="", pair default=0, string prompt="",
bool store=true);
triple gettriple(string name="", triple default=(0,0,0), string prompt="",
bool store=true);
-defined in the module 'plain' may be used to prompt for a value from
-'stdin' using the GNU 'readline' library. If 'store=true', the history
-of values for 'name' is stored in the file '".asy_history_"+name' (*note
+defined in the module ‘plain’ may be used to prompt for a value from
+‘stdin’ using the GNU ‘readline’ library. If ‘store=true’, the history
+of values for ‘name’ is stored in the file ‘".asy_history_"+name’ (*note
history::). The most recent value in the history will be used to
provide a default value for subsequent runs. The default value
-(initially 'default') is displayed after 'prompt'. These functions are
+(initially ‘default’) is displayed after ‘prompt’. These functions are
based on the internal routines
string readline(string prompt="", string name="", bool tabcompletion=false);
void saveline(string name, string value, bool store=true);
- Here, 'readline' prompts the user with the default value formatted
-according to 'prompt', while 'saveline' is used to save the string
-'value' in a local history named 'name', optionally storing the local
-history in a file '".asy_history_"+name'.
-
- The routine 'history(string name, int n=1)' can be used to look up
-the 'n' most recent values (or all values up to 'historylines' if 'n=0')
-entered for string 'name'. The routine 'history(int n=0)' returns the
+ Here, ‘readline’ prompts the user with the default value formatted
+according to ‘prompt’, while ‘saveline’ is used to save the string
+‘value’ in a local history named ‘name’, optionally storing the local
+history in a file ‘".asy_history_"+name’.
+
+ The routine ‘history(string name, int n=1)’ can be used to look up
+the ‘n’ most recent values (or all values up to ‘historylines’ if ‘n=0’)
+entered for string ‘name’. The routine ‘history(int n=0)’ returns the
interactive history. For example,
write(output("transcript.asy"),history());
-outputs the interactive history to the file 'transcript.asy'.
+outputs the interactive history to the file ‘transcript.asy’.
- The function 'int delete(string s)' deletes the file named by the
-string 's'. Unless the '-globalwrite' (or '-nosafe') option is enabled,
-the file must reside in the current directory. The function 'int
-rename(string from, string to)' may be used to rename file 'from' to
-file 'to'. Unless the '-globalwrite' (or '-nosafe') option is enabled,
+ The function ‘int delete(string s)’ deletes the file named by the
+string ‘s’. Unless the ‘-globalwrite’ (or ‘-nosafe’) option is enabled,
+the file must reside in the current directory. The function ‘int
+rename(string from, string to)’ may be used to rename file ‘from’ to
+file ‘to’. Unless the ‘-globalwrite’ (or ‘-nosafe’) option is enabled,
this operation is restricted to the current directory. The functions
int convert(string args="", string file="", string format="");
int animate(string args="", string file="", string format="");
-call the 'ImageMagick' commands 'convert' and 'animate', respectively,
-with the arguments 'args' and the file name constructed from the strings
-'file' and 'format'.
+call the ‘ImageMagick’ commands ‘convert’ and ‘animate’, respectively,
+with the arguments ‘args’ and the file name constructed from the strings
+‘file’ and ‘format’.

File: asymptote.info, Node: Variable initializers, Next: Structures, Prev: Files, Up: Programming
@@ -3194,56 +3198,56 @@ File: asymptote.info, Node: Variable initializers, Next: Structures, Prev: Fi
6.7 Variable initializers
=========================
-A variable can be assigned a value when it is declared, as in 'int x=3;'
-where the variable 'x' is assigned the value '3'. As well as literal
-constants such as '3', arbitary expressions can be used as initializers,
-as in 'real x=2*sin(pi/2);'.
+A variable can be assigned a value when it is declared, as in ‘int x=3;’
+where the variable ‘x’ is assigned the value ‘3’. As well as literal
+constants such as ‘3’, arbitary expressions can be used as initializers,
+as in ‘real x=2*sin(pi/2);’.
A variable is not added to the namespace until after the initializer
is evaluated, so for example, in
int x=2;
int x=5*x;
-the 'x' in the initializer on the second line refers to the variable 'x'
+the ‘x’ in the initializer on the second line refers to the variable ‘x’
declared on the first line. The second line, then, declares a variable
-'x' shadowing the original 'x' and initializes it to the value '10'.
+‘x’ shadowing the original ‘x’ and initializes it to the value ‘10’.
Variables of most types can be declared without an explicit
initializer and they will be initialized by the default initializer of
that type:
- * Variables of the numeric types 'int', 'real', and 'pair' are all
- initialized to zero; variables of type 'triple' are initialized to
- 'O=(0,0,0)'.
- * 'boolean' variables are initialized to 'false'.
- * 'string' variables are initialized to the empty string.
- * 'transform' variables are initialized to the identity
+ • Variables of the numeric types ‘int’, ‘real’, and ‘pair’ are all
+ initialized to zero; variables of type ‘triple’ are initialized to
+ ‘O=(0,0,0)’.
+ • ‘boolean’ variables are initialized to ‘false’.
+ • ‘string’ variables are initialized to the empty string.
+ • ‘transform’ variables are initialized to the identity
transformation.
- * 'path' and 'guide' variables are initialized to 'nullpath'.
- * 'pen' variables are initialized to the default pen.
- * 'frame' and 'picture' variables are initialized to empty frames and
+ • ‘path’ and ‘guide’ variables are initialized to ‘nullpath’.
+ • ‘pen’ variables are initialized to the default pen.
+ • ‘frame’ and ‘picture’ variables are initialized to empty frames and
pictures, respectively.
- * 'file' variables are initialized to 'null'.
+ • ‘file’ variables are initialized to ‘null’.
The default initializers for user-defined array, structure, and
function types are explained in their respective sections. Some types,
-such as 'code', do not have default initializers. When a variable of
+such as ‘code’, do not have default initializers. When a variable of
such a type is introduced, the user must initialize it by explicitly
giving it a value.
- The default initializer for any type 'T' can be redeclared by
-defining the function 'T operator init()'. For instance, 'int'
+ The default initializer for any type ‘T’ can be redeclared by
+defining the function ‘T operator init()’. For instance, ‘int’
variables are usually initialized to zero, but in
int operator init() {
return 3;
}
int y;
-the variable 'y' is initialized to '3'. This example was given for
+the variable ‘y’ is initialized to ‘3’. This example was given for
illustrative purposes; redeclaring the initializers of built-in types is
-not recommended. Typically, 'operator init' is used to define sensible
+not recommended. Typically, ‘operator init’ is used to define sensible
defaults for user-defined types.
- The special type 'var' may be used to infer the type of a variable
+ The special type ‘var’ may be used to infer the type of a variable
from its initializer. If the initializer is an expression of a unique
type, then the variable will be defined with that type. For instance,
var x=5;
@@ -3254,7 +3258,7 @@ int x=5;
real y=4.3;
pen reddash=red+dashed;
- 'var' may also be used with the extended 'for' loop syntax.
+ ‘var’ may also be used with the extended ‘for’ loop syntax.
int[] a = {1,2,3};
for (var x : a)
@@ -3268,11 +3272,11 @@ File: asymptote.info, Node: Structures, Next: Operators, Prev: Variable initi
Users may also define their own data types as structures, along with
user-defined operators, much as in C++. By default, structure members
-are 'public' (may be read and modified anywhere in the code), but may be
-optionally declared 'restricted' (readable anywhere but writeable only
-inside the structure where they are defined) or 'private' (readable and
+are ‘public’ (may be read and modified anywhere in the code), but may be
+optionally declared ‘restricted’ (readable anywhere but writeable only
+inside the structure where they are defined) or ‘private’ (readable and
writable only inside the structure). In a structure definition, the
-keyword 'this' can be used as an expression to refer to the enclosing
+keyword ‘this’ can be used as an expression to refer to the enclosing
structure. Any code at the top-level scope within the structure is
executed on initialization.
@@ -3285,13 +3289,13 @@ T foo;
T bar=foo;
bar.x=5;
- The variable 'foo' holds a reference to an instance of the structure
-'T'. When 'bar' is assigned the value of 'foo', it too now holds a
-reference to the same instance as 'foo' does. The assignment 'bar.x=5'
-changes the value of the field 'x' in that instance, so that 'foo.x'
-will also be equal to '5'.
+ The variable ‘foo’ holds a reference to an instance of the structure
+‘T’. When ‘bar’ is assigned the value of ‘foo’, it too now holds a
+reference to the same instance as ‘foo’ does. The assignment ‘bar.x=5’
+changes the value of the field ‘x’ in that instance, so that ‘foo.x’
+will also be equal to ‘5’.
- The expression 'new T' creates a new instance of the structure 'T'
+ The expression ‘new T’ creates a new instance of the structure ‘T’
and returns a reference to that instance. In creating the new instance,
any code in the body of the record definition is executed. For example:
int Tcount=0;
@@ -3302,13 +3306,13 @@ struct T {
T foo=new T;
T foo;
-Here, 'new T' produces a new instance of the class, which causes
-'Tcount' to be incremented, tracking the number of instances produced.
-The declarations 'T foo=new T' and 'T foo' are equivalent: the second
-form implicitly creates a new instance of 'T'. That is, after the
-definition of a structure 'T', a variable of type 'T' is initialized to
-a new instance ('new T') by default. During the definition of the
-structure, however, variables of type 'T' are initialized to 'null' by
+Here, ‘new T’ produces a new instance of the class, which causes
+‘Tcount’ to be incremented, tracking the number of instances produced.
+The declarations ‘T foo=new T’ and ‘T foo’ are equivalent: the second
+form implicitly creates a new instance of ‘T’. That is, after the
+definition of a structure ‘T’, a variable of type ‘T’ is initialized to
+a new instance (‘new T’) by default. During the definition of the
+structure, however, variables of type ‘T’ are initialized to ‘null’ by
default. This special behaviour is to avoid infinite recursion of
creating new instances in code such as
struct tree {
@@ -3317,18 +3321,18 @@ struct tree {
tree right;
}
- The expression 'null' can be cast to any structure type to yield a
+ The expression ‘null’ can be cast to any structure type to yield a
null reference, a reference that does not actually refer to any instance
of the structure. Trying to use a field of a null reference will cause
an error.
- The function 'bool alias(T,T)' checks to see if two structure
+ The function ‘bool alias(T,T)’ checks to see if two structure
references refer to the same instance of the structure (or both to
-'null'). In the example at the beginning of this section,
-'alias(foo,bar)' would return true, but 'alias(foo,new T)' would return
-false, as 'new T' creates a new instance of the structure 'T'. The
-boolean operators '==' and '!=' are by default equivalent to 'alias' and
-'!alias' respectively, but may be overwritten for a particular type (for
+‘null’). In the example at the beginning of this section,
+‘alias(foo,bar)’ would return true, but ‘alias(foo,new T)’ would return
+false, as ‘new T’ creates a new instance of the structure ‘T’. The
+boolean operators ‘==’ and ‘!=’ are by default equivalent to ‘alias’ and
+‘!alias’ respectively, but may be overwritten for a particular type (for
example, to do a deep comparison).
Here is a simple example that illustrates the use of structures:
@@ -3352,7 +3356,7 @@ write((s+s).f(0)); // Outputs 2
It is often convenient to have functions that construct new instances
-of a structure. Say we have a 'Person' structure:
+of a structure. Say we have a ‘Person’ structure:
struct Person {
string firstname;
string lastname;
@@ -3362,11 +3366,11 @@ Person joe;
joe.firstname="Joe";
joe.lastname="Jones";
Creating a new Person is a chore; it takes three lines to create a new
-instance and to initialize its fields (that's still considerably less
+instance and to initialize its fields (that’s still considerably less
effort than creating a new person in real life, though).
We can reduce the work by defining a constructor function
-'Person(string,string)':
+‘Person(string,string)’:
struct Person {
string firstname;
string lastname;
@@ -3382,11 +3386,11 @@ struct Person {
Person joe=Person.Person("Joe", "Jones");
While it is now easier than before to create a new instance, we still
-have to refer to the constructor by the qualified name 'Person.Person'.
+have to refer to the constructor by the qualified name ‘Person.Person’.
If we add the line
from Person unravel Person;
immediately after the structure definition, then the constructor can be
-used without qualification: 'Person joe=Person("Joe", "Jones");'.
+used without qualification: ‘Person joe=Person("Joe", "Jones");’.
The constructor is now easy to use, but it is quite a hassle to
define. If you write a lot of constructors, you will find that you are
@@ -3395,11 +3399,11 @@ neighbourhood Asymptote developers have devised a way to automate much
of the process.
If, in the body of a structure, Asymptote encounters the definition
-of a function of the form 'void operator init(ARGS)', it implicitly
-defines a constructor function of the arguments 'ARGS' that uses the
-'void operator init' function to initialize a new instance of the
+of a function of the form ‘void operator init(ARGS)’, it implicitly
+defines a constructor function of the arguments ‘ARGS’ that uses the
+‘void operator init’ function to initialize a new instance of the
structure. That is, it essentially defines the following constructor
-(assuming the structure is called 'Foo'):
+(assuming the structure is called ‘Foo’):
static Foo Foo(ARGS) {
Foo instance=new Foo;
@@ -3409,7 +3413,7 @@ structure. That is, it essentially defines the following constructor
This constructor is also implicitly copied to the enclosing scope
after the end of the structure definition, so that it can used
-subsequently without qualifying it by the structure name. Our 'Person'
+subsequently without qualifying it by the structure name. Our ‘Person’
example can thus be implemented as:
struct Person {
string firstname;
@@ -3423,24 +3427,24 @@ struct Person {
Person joe=Person("Joe", "Jones");
- The use of 'operator init' to implicitly define constructors should
+ The use of ‘operator init’ to implicitly define constructors should
not be confused with its use to define default values for variables
(*note Variable initializers::). Indeed, in the first case, the return
-type of the 'operator init' must be 'void' while in the second, it must
-be the (non-'void') type of the variable.
-
- The function 'cputime()' returns a structure 'cputime' with
-cumulative CPU times broken down into the fields 'parent.user',
-'parent.system', 'child.user', and 'child.system', along with the
-cumulative wall clock time in 'parent.clock', all measured in seconds.
-For convenience, the incremental fields 'change.user', 'change.system',
-and 'change.clock' indicate the change in the corresponding fields since
-the last call to 'cputime()'. The function
+type of the ‘operator init’ must be ‘void’ while in the second, it must
+be the (non-‘void’) type of the variable.
+
+ The function ‘cputime()’ returns a structure ‘cputime’ with
+cumulative CPU times broken down into the fields ‘parent.user’,
+‘parent.system’, ‘child.user’, and ‘child.system’, along with the
+cumulative wall clock time in ‘parent.clock’, all measured in seconds.
+For convenience, the incremental fields ‘change.user’, ‘change.system’,
+and ‘change.clock’ indicate the change in the corresponding fields since
+the last call to ‘cputime()’. The function
void write(file file=stdout, string s="", cputime c,
string format=cputimeformat, suffix suffix=none);
-displays the incremental user cputime followed by "u", the incremental
-system cputime followed by "s", the total user cputime followed by "U",
-and the total system cputime followed by "S".
+displays the incremental user cputime followed by “u”, the incremental
+system cputime followed by “s”, the total user cputime followed by “U”,
+and the total system cputime followed by “S”.
Much like in C++, casting (*note Casts::) provides for an elegant
implementation of structure inheritance, including virtual functions:
@@ -3475,8 +3479,8 @@ c.f(); // Outputs 1;
write(c.parent.x); // Outputs 2;
write(c.y); // Outputs 3;
- For further examples of structures, see 'Legend' and 'picture' in the
-'Asymptote' base module 'plain'.
+ For further examples of structures, see ‘Legend’ and ‘picture’ in the
+‘Asymptote’ base module ‘plain’.

File: asymptote.info, Node: Operators, Next: Implicit scaling, Prev: Structures, Up: Programming
@@ -3496,73 +3500,73 @@ File: asymptote.info, Node: Arithmetic & logical, Next: Self & prefix operator
6.9.1 Arithmetic & logical operators
------------------------------------
-'Asymptote' uses the standard binary arithmetic operators. However,
+‘Asymptote’ uses the standard binary arithmetic operators. However,
when one integer is divided by another, both arguments are converted to
real values before dividing and a real quotient is returned (since this
-is typically what is intended; otherwise one can use the function 'int
-quotient(int x, int y)', which returns greatest integer less than or
-equal to 'x/y'). In all other cases both operands are promoted to the
+is typically what is intended; otherwise one can use the function ‘int
+quotient(int x, int y)’, which returns greatest integer less than or
+equal to ‘x/y’). In all other cases both operands are promoted to the
same type, which will also be the type of the result:
-'+'
+‘+’
addition
-'-'
+‘-’
subtraction
-'*'
+‘*’
multiplication
-'/'
+‘/’
division
-'#'
- integer division; equivalent to 'quotient(x,y)'. Noting that the
- 'Python3' community adopted our comment symbol ('//') for integer
+‘#’
+ integer division; equivalent to ‘quotient(x,y)’. Noting that the
+ ‘Python3’ community adopted our comment symbol (‘//’) for integer
division, we decided to reciprocate and use their comment symbol
- for integer division in 'Asymptote'!
-'%'
+ for integer division in ‘Asymptote’!
+‘%’
modulo; the result always has the same sign as the divisor. In
- particular, this makes 'q*(p # q)+p % q == p' for all integers 'p'
- and nonzero integers 'q'.
-'^'
+ particular, this makes ‘q*(p # q)+p % q == p’ for all integers ‘p’
+ and nonzero integers ‘q’.
+‘^’
power; if the exponent (second argument) is an int, recursive
multiplication is used; otherwise, logarithms and exponentials are
- used ('**' is a synonym for '^').
+ used (‘**’ is a synonym for ‘^’).
The usual boolean operators are also defined:
-'=='
+‘==’
equals
-'!='
+‘!=’
not equals
-'<'
+‘<’
less than
-'<='
+‘<=’
less than or equals
-'>='
+‘>=’
greater than or equals
-'>'
+‘>’
greater than
-'&&'
+‘&&’
and (with conditional evaluation of right-hand argument)
-'&'
+‘&’
and
-'||'
+‘||’
or (with conditional evaluation of right-hand argument)
-'|'
+‘|’
or
-'^'
+‘^’
xor
-'!'
+‘!’
not
- 'Asymptote' also supports the C-like conditional syntax:
+ ‘Asymptote’ also supports the C-like conditional syntax:
bool positive=(pi > 0) ? true : false;
- The function 'T interp(T a, T b, real t)' returns '(1-t)*a+t*b' for
-nonintegral built-in arithmetic types 'T'. If 'a' and 'b' are pens,
+ The function ‘T interp(T a, T b, real t)’ returns ‘(1-t)*a+t*b’ for
+nonintegral built-in arithmetic types ‘T’. If ‘a’ and ‘b’ are pens,
they are first promoted to the same color space.
- 'Asymptote' also defines bitwise functions 'int AND(int,int)', 'int
-OR(int,int)', 'int XOR(int,int)', 'int NOT(int)', 'int CLZ(int)' (count
-leading zeros), 'int CTZ(int)' (count trailing zeros), 'int
-popcount(int)' (count bits populated by ones), and 'int bitreverse(int
-a, int bits)' (reverse bits within a word of length bits).
+ ‘Asymptote’ also defines bitwise functions ‘int AND(int,int)’, ‘int
+OR(int,int)’, ‘int XOR(int,int)’, ‘int NOT(int)’, ‘int CLZ(int)’ (count
+leading zeros), ‘int CTZ(int)’ (count trailing zeros), ‘int
+popcount(int)’ (count bits populated by ones), and ‘int bitreverse(int
+a, int bits)’ (reverse bits within a word of length bits).

File: asymptote.info, Node: Self & prefix operators, Next: User-defined operators, Prev: Arithmetic & logical, Up: Operators
@@ -3570,9 +3574,9 @@ File: asymptote.info, Node: Self & prefix operators, Next: User-defined operat
6.9.2 Self & prefix operators
-----------------------------
-As in C, each of the arithmetic operators '+', '-', '*', '/', '#', '%',
-and '^' can be used as a self operator. The prefix operators '++'
-(increment by one) and '--' (decrement by one) are also defined. For
+As in C, each of the arithmetic operators ‘+’, ‘-’, ‘*’, ‘/’, ‘#’, ‘%’,
+and ‘^’ can be used as a self operator. The prefix operators ‘++’
+(increment by one) and ‘--’ (decrement by one) are also defined. For
example,
int i=1;
i += 2;
@@ -3583,11 +3587,11 @@ int i=1;
i=i+2;
int j=i=i+1;
- However, postfix operators like 'i++' and 'i--' are not defined
-(because of the inherent ambiguities that would arise with the '--'
-path-joining operator). In the rare instances where 'i++' and 'i--' are
-really needed, one can substitute the expressions '(++i-1)' and
-'(--i+1)', respectively.
+ However, postfix operators like ‘i++’ and ‘i--’ are not defined
+(because of the inherent ambiguities that would arise with the ‘--’
+path-joining operator). In the rare instances where ‘i++’ and ‘i--’ are
+really needed, one can substitute the expressions ‘(++i-1)’ and
+‘(--i+1)’, respectively.

File: asymptote.info, Node: User-defined operators, Prev: Self & prefix operators, Up: Operators
@@ -3595,14 +3599,14 @@ File: asymptote.info, Node: User-defined operators, Prev: Self & prefix operat
6.9.3 User-defined operators
----------------------------
-The following symbols may be used with 'operator' to define or redefine
+The following symbols may be used with ‘operator’ to define or redefine
operators on structures and built-in types:
- + * / % ^ ! < > == != <= >= & | ^^ .. :: -- --- ++
<< >> $ $$ @ @@ <>
The operators on the second line have precedence one higher than the
-boolean operators '<', '>', '<=', and '>='.
+boolean operators ‘<’, ‘>’, ‘<=’, and ‘>=’.
- Guide operators like '..' may be overloaded, say, to write a user
+ Guide operators like ‘..’ may be overloaded, say, to write a user
function that produces a new guide from a given guide:
guide dots(... guide[] g)=operator ..;
@@ -3673,14 +3677,14 @@ File: asymptote.info, Node: Functions, Next: Arrays, Prev: Implicit scaling,
* Rest arguments:: Functions with a variable number of arguments
* Mathematical functions:: Standard libm functions
-'Asymptote' functions are treated as variables with a signature
+‘Asymptote’ functions are treated as variables with a signature
(non-function variables have null signatures). Variables with the same
name are allowed, so long as they have distinct signatures.
Function arguments are passed by value. To pass an argument by
reference, simply enclose it in a structure (*note Structures::).
- Here are some significant features of 'Asymptote' functions:
+ Here are some significant features of ‘Asymptote’ functions:
1. Variables with signatures (functions) and without signatures
(nonfunction variables) are distinct:
@@ -3715,11 +3719,11 @@ reference, simply enclose it in a structure (*note Structures::).
intop addby7=adder(7);
write(addby7(1)); // Writes 8.
- 5. One may redefine a function 'f', even for calls to 'f' in
+ 5. One may redefine a function ‘f’, even for calls to ‘f’ in
previously declared functions, by assigning another (anonymous or
- named) function to it. However, if 'f' is overloaded by a new
+ named) function to it. However, if ‘f’ is overloaded by a new
function definition, previous calls will still access the original
- version of 'f', as illustrated in this example:
+ version of ‘f’, as illustrated in this example:
void f() {
write("hi");
}
@@ -3756,14 +3760,14 @@ reference, simply enclose it in a structure (*note Structures::).
g(true); // Writes true, then writes false.
- 'Asymptote' is the only language we know of that treats functions as
+ ‘Asymptote’ is the only language we know of that treats functions as
variables, but allows overloading by distinguishing variables based on
their signatures.
Functions are allowed to call themselves recursively. As in C++,
infinite nested recursion will generate a stack overflow (reported as a
segmentation fault, unless a fully working version of the GNU library
-'libsigsegv' (e.g. 2.4 or later) is installed at configuration time).
+‘libsigsegv’ (e.g. 2.4 or later) is installed at configuration time).

File: asymptote.info, Node: Default arguments, Next: Named arguments, Prev: Functions, Up: Functions
@@ -3771,17 +3775,17 @@ File: asymptote.info, Node: Default arguments, Next: Named arguments, Prev: F
6.11.1 Default arguments
------------------------
-'Asymptote' supports a more flexible mechanism for default function
+‘Asymptote’ supports a more flexible mechanism for default function
arguments than C++: they may appear anywhere in the function prototype.
Because certain data types are implicitly cast to more sophisticated
types (*note Casts::) one can often avoid ambiguities by ordering
function arguments from the simplest to the most complicated. For
example, given
real f(int a=1, real b=0) {return a+b;}
-then 'f(1)' returns 1.0, but 'f(1.0)' returns 2.0.
+then ‘f(1)’ returns 1.0, but ‘f(1.0)’ returns 2.0.
The value of a default argument is determined by evaluating the given
-'Asymptote' expression in the scope where the called function is
+‘Asymptote’ expression in the scope where the called function is
defined.

@@ -3795,8 +3799,8 @@ appear in a function declaration. Named (keyword) arguments make
calling functions with multiple arguments easier. Unlike in the C and
C++ languages, an assignment in a function argument is interpreted as an
assignment to a parameter of the same name in the function signature,
-_not within the local scope_. The command-line option '-d' may be used
-to check 'Asymptote' code for cases where a named argument may be
+_not within the local scope_. The command-line option ‘-d’ may be used
+to check ‘Asymptote’ code for cases where a named argument may be
mistaken for a local assignment.
When matching arguments to signatures, first all of the keywords are
@@ -3806,13 +3810,13 @@ int f(int x, int y) {
return 10x+y;
}
write(f(4,x=3));
-outputs 34, as 'x' is already matched when we try to match the unnamed
-argument '4', so it gets matched to the next item, 'y'.
+outputs 34, as ‘x’ is already matched when we try to match the unnamed
+argument ‘4’, so it gets matched to the next item, ‘y’.
For the rare occasions where it is desirable to assign a value to
local variable within a function argument (generally _not_ a good
programming practice), simply enclose the assignment in parentheses.
-For example, given the definition of 'f' in the previous example,
+For example, given the definition of ‘f’ in the previous example,
int x;
write(f(4,(x=3)));
is equivalent to the statements
@@ -3821,11 +3825,11 @@ x=3;
write(f(4,3));
and outputs 43.
- Parameters can be specified as "keyword-only" by putting 'keyword'
-immediately before the parameter name, as in 'int f(int keyword x)' or
-'int f(int keyword x=77)'. This forces the caller of the function to
+ Parameters can be specified as “keyword-only” by putting ‘keyword’
+immediately before the parameter name, as in ‘int f(int keyword x)’ or
+‘int f(int keyword x=77)’. This forces the caller of the function to
use a named argument to give a value for this parameter. That is,
-'f(x=42)' is legal, but 'f(25)' is not. Keyword-only parameters must be
+‘f(x=42)’ is legal, but ‘f(25)’ is not. Keyword-only parameters must be
listed after normal parameters in a function definition.
As a technical detail, we point out that, since variables of the same
@@ -3834,16 +3838,16 @@ int f(int x, int x()) {
return x+x();
}
int seven() {return 7;}
-is legal in 'Asymptote', with 'f(2,seven)' returning 9. A named
+is legal in ‘Asymptote’, with ‘f(2,seven)’ returning 9. A named
argument matches the first unmatched formal of the same name, so
-'f(x=2,x=seven)' is an equivalent call, but 'f(x=seven,2)' is not, as
-the first argument is matched to the first formal, and 'int ()' cannot
-be implicitly cast to 'int'. Default arguments do not affect which
-formal a named argument is matched to, so if 'f' were defined as
+‘f(x=2,x=seven)’ is an equivalent call, but ‘f(x=seven,2)’ is not, as
+the first argument is matched to the first formal, and ‘int ()’ cannot
+be implicitly cast to ‘int’. Default arguments do not affect which
+formal a named argument is matched to, so if ‘f’ were defined as
int f(int x=3, int x()) {
return x+x();
}
-then 'f(x=seven)' would be illegal, even though 'f(seven)' obviously
+then ‘f(x=seven)’ would be illegal, even though ‘f(seven)’ obviously
would be allowed.

@@ -3877,7 +3881,7 @@ subtract(10); // returns 10
subtract(); // illegal
Putting an argument into a rest array is called _packing_. One can
-give an explicit list of arguments for the rest argument, so 'subtract'
+give an explicit list of arguments for the rest argument, so ‘subtract’
could alternatively be implemented as
int subtract(int start ... int[] subs) {
return start - sum(... subs);
@@ -3885,26 +3889,26 @@ int subtract(int start ... int[] subs) {
One can even combine normal arguments with rest arguments:
sum(1,2,3 ... new int[] {4,5,6}); // returns 21
-This builds a new six-element array that is passed to 'sum' as 'nums'.
+This builds a new six-element array that is passed to ‘sum’ as ‘nums’.
The opposite operation, _unpacking_, is not allowed:
subtract(... new int[] {10, 1, 2});
is illegal, as the start formal is not matched.
If no arguments are packed, then a zero-length array (as opposed to
-'null') is bound to the rest parameter. Note that default arguments are
+‘null’) is bound to the rest parameter. Note that default arguments are
ignored for rest formals and the rest argument is not bound to a
keyword.
In some cases, keyword-only parameters are helpful to avoid arguments
intended for the rest parameter to be assigned to other parameters. For
-example, here the use of 'keyword' is to avoid 'pnorm(1.0,2.0,0.3)'
-matching '1.0' to 'p'.
+example, here the use of ‘keyword’ is to avoid ‘pnorm(1.0,2.0,0.3)’
+matching ‘1.0’ to ‘p’.
real pnorm(real keyword p=2.0 ... real[] v)
{
return sum(v^p)^(1/p);
}
- The overloading resolution in 'Asymptote' is similar to the function
+ The overloading resolution in ‘Asymptote’ is similar to the function
matching rules used in C++. Every argument match is given a score.
Exact matches score better than matches with casting, and matches with
formals (regardless of casting) score better than packing an argument
@@ -3940,84 +3944,84 @@ File: asymptote.info, Node: Mathematical functions, Prev: Rest arguments, Up:
6.11.4 Mathematical functions
-----------------------------
-'Asymptote' has built-in versions of the standard 'libm' mathematical
-real(real) functions 'sin', 'cos', 'tan', 'asin', 'acos', 'atan', 'exp',
-'log', 'pow10', 'log10', 'sinh', 'cosh', 'tanh', 'asinh', 'acosh',
-'atanh', 'sqrt', 'cbrt', 'fabs', 'expm1', 'log1p', as well as the
-identity function 'identity'. 'Asymptote' also defines the order 'n'
-Bessel functions of the first kind 'Jn(int n, real)' and second kind
-'Yn(int n, real)', as well as the gamma function 'gamma', the error
-function 'erf', and the complementary error function 'erfc'. The
-standard real(real, real) functions 'atan2', 'hypot', 'fmod',
-'remainder' are also included.
-
- The functions 'degrees(real radians)' and 'radians(real degrees)' can
+‘Asymptote’ has built-in versions of the standard ‘libm’ mathematical
+real(real) functions ‘sin’, ‘cos’, ‘tan’, ‘asin’, ‘acos’, ‘atan’, ‘exp’,
+‘log’, ‘pow10’, ‘log10’, ‘sinh’, ‘cosh’, ‘tanh’, ‘asinh’, ‘acosh’,
+‘atanh’, ‘sqrt’, ‘cbrt’, ‘fabs’, ‘expm1’, ‘log1p’, as well as the
+identity function ‘identity’. ‘Asymptote’ also defines the order ‘n’
+Bessel functions of the first kind ‘Jn(int n, real)’ and second kind
+‘Yn(int n, real)’, as well as the gamma function ‘gamma’, the error
+function ‘erf’, and the complementary error function ‘erfc’. The
+standard real(real, real) functions ‘atan2’, ‘hypot’, ‘fmod’,
+‘remainder’ are also included.
+
+ The functions ‘degrees(real radians)’ and ‘radians(real degrees)’ can
be used to convert between radians and degrees. The function
-'Degrees(real radians)' returns the angle in degrees in the interval
-[0,360). For convenience, 'Asymptote' defines variants 'Sin', 'Cos',
-'Tan', 'aSin', 'aCos', and 'aTan' of the standard trigonometric
+‘Degrees(real radians)’ returns the angle in degrees in the interval
+[0,360). For convenience, ‘Asymptote’ defines variants ‘Sin’, ‘Cos’,
+‘Tan’, ‘aSin’, ‘aCos’, and ‘aTan’ of the standard trigonometric
functions that use degrees rather than radians. We also define complex
-versions of the 'sqrt', 'sin', 'cos', 'exp', 'log', and 'gamma'
+versions of the ‘sqrt’, ‘sin’, ‘cos’, ‘exp’, ‘log’, and ‘gamma’
functions.
- The functions 'floor', 'ceil', and 'round' differ from their usual
+ The functions ‘floor’, ‘ceil’, and ‘round’ differ from their usual
definitions in that they all return an int value rather than a real
-(since that is normally what one wants). The functions 'Floor', 'Ceil',
-and 'Round' are respectively similar, except that if the result cannot
-be converted to a valid int, they return 'intMax' for positive arguments
-and 'intMin' for negative arguments, rather than generating an integer
-overflow. We also define a function 'sgn', which returns the sign of
+(since that is normally what one wants). The functions ‘Floor’, ‘Ceil’,
+and ‘Round’ are respectively similar, except that if the result cannot
+be converted to a valid int, they return ‘intMax’ for positive arguments
+and ‘intMin’ for negative arguments, rather than generating an integer
+overflow. We also define a function ‘sgn’, which returns the sign of
its real argument as an integer (-1, 0, or 1).
- There is an 'abs(int)' function, as well as an 'abs(real)' function
-(equivalent to 'fabs(real)'), an 'abs(pair)' function (equivalent to
-'length(pair)').
+ There is an ‘abs(int)’ function, as well as an ‘abs(real)’ function
+(equivalent to ‘fabs(real)’), an ‘abs(pair)’ function (equivalent to
+‘length(pair)’).
- Random numbers can be seeded with 'srand(int)' and generated with the
-'int rand()' function, which returns a random integer between 0 and the
-integer 'randMax'. The 'unitrand()' function returns a random number
+ Random numbers can be seeded with ‘srand(int)’ and generated with the
+‘int rand()’ function, which returns a random integer between 0 and the
+integer ‘randMax’. The ‘unitrand()’ function returns a random number
uniformly distributed in the interval [0,1]. A Gaussian random number
-generator 'Gaussrand' and a collection of statistics routines, including
-'histogram', are provided in the module 'stats'. The functions
-'factorial(int n)', which returns n!, and 'choose(int n, int k)', which
+generator ‘Gaussrand’ and a collection of statistics routines, including
+‘histogram’, are provided in the module ‘stats’. The functions
+‘factorial(int n)’, which returns n!, and ‘choose(int n, int k)’, which
returns n!/(k!(n-k)!), are also defined.
When configured with the GNU Scientific Library (GSL), available from
-<https://www.gnu.org/software/gsl/>, 'Asymptote' contains an internal
-module 'gsl' that defines the airy functions 'Ai(real)', 'Bi(real)',
-'Ai_deriv(real)', 'Bi_deriv(real)', 'zero_Ai(int)', 'zero_Bi(int)',
-'zero_Ai_deriv(int)', 'zero_Bi_deriv(int)', the Bessel functions 'I(int,
-real)', 'K(int, real)', 'j(int, real)', 'y(int, real)', 'i_scaled(int,
-real)', 'k_scaled(int, real)', 'J(real, real)', 'Y(real, real)',
-'I(real, real)', 'K(real, real)', 'zero_J(real, int)', the elliptic
-functions 'F(real, real)', 'E(real, real)', and 'P(real, real)', the
-Jacobi elliptic functions 'real[] sncndn(real,real)', the
-exponential/trigonometric integrals 'Ei', 'Si', and 'Ci', the Legendre
-polynomials 'Pl(int, real)', and the Riemann zeta function 'zeta(real)'.
-For example, to compute the sine integral 'Si' of 1.0:
+<https://www.gnu.org/software/gsl/>, ‘Asymptote’ contains an internal
+module ‘gsl’ that defines the airy functions ‘Ai(real)’, ‘Bi(real)’,
+‘Ai_deriv(real)’, ‘Bi_deriv(real)’, ‘zero_Ai(int)’, ‘zero_Bi(int)’,
+‘zero_Ai_deriv(int)’, ‘zero_Bi_deriv(int)’, the Bessel functions ‘I(int,
+real)’, ‘K(int, real)’, ‘j(int, real)’, ‘y(int, real)’, ‘i_scaled(int,
+real)’, ‘k_scaled(int, real)’, ‘J(real, real)’, ‘Y(real, real)’,
+‘I(real, real)’, ‘K(real, real)’, ‘zero_J(real, int)’, the elliptic
+functions ‘F(real, real)’, ‘E(real, real)’, and ‘P(real, real)’, the
+Jacobi elliptic functions ‘real[] sncndn(real,real)’, the
+exponential/trigonometric integrals ‘Ei’, ‘Si’, and ‘Ci’, the Legendre
+polynomials ‘Pl(int, real)’, and the Riemann zeta function ‘zeta(real)’.
+For example, to compute the sine integral ‘Si’ of 1.0:
import gsl;
write(Si(1.0));
- 'Asymptote' also provides a few general purpose numerical routines:
+ ‘Asymptote’ also provides a few general purpose numerical routines:
-'real newton(int iterations=100, real f(real), real fprime(real), real x, bool verbose=false);'
+‘real newton(int iterations=100, real f(real), real fprime(real), real x, bool verbose=false);’
Use Newton-Raphson iteration to solve for a root of a real-valued
- differentiable function 'f', given its derivative 'fprime' and an
- initial guess 'x'. Diagnostics for each iteration are printed if
- 'verbose=true'. If the iteration fails after the maximum allowed
- number of loops ('iterations'), 'realMax' is returned.
+ differentiable function ‘f’, given its derivative ‘fprime’ and an
+ initial guess ‘x’. Diagnostics for each iteration are printed if
+ ‘verbose=true’. If the iteration fails after the maximum allowed
+ number of loops (‘iterations’), ‘realMax’ is returned.
-'real newton(int iterations=100, real f(real), real fprime(real), real x1, real x2, bool verbose=false);'
+‘real newton(int iterations=100, real f(real), real fprime(real), real x1, real x2, bool verbose=false);’
Use bracketed Newton-Raphson bisection to solve for a root of a
- real-valued differentiable function 'f' within an interval
- ['x1','x2'] (on which the endpoint values of 'f' have opposite
- signs), given its derivative 'fprime'. Diagnostics for each
- iteration are printed if 'verbose=true'. If the iteration fails
- after the maximum allowed number of loops ('iterations'), 'realMax'
+ real-valued differentiable function ‘f’ within an interval
+ [‘x1’,‘x2’] (on which the endpoint values of ‘f’ have opposite
+ signs), given its derivative ‘fprime’. Diagnostics for each
+ iteration are printed if ‘verbose=true’. If the iteration fails
+ after the maximum allowed number of loops (‘iterations’), ‘realMax’
is returned.
-'real simpson(real f(real), real a, real b, real acc=realEpsilon, real dxmax=b-a)'
- returns the integral of 'f' from 'a' to 'b' using adaptive Simpson
+‘real simpson(real f(real), real a, real b, real acc=realEpsilon, real dxmax=b-a)’
+ returns the integral of ‘f’ from ‘a’ to ‘b’ using adaptive Simpson
integration.

@@ -4030,69 +4034,69 @@ File: asymptote.info, Node: Arrays, Next: Casts, Prev: Functions, Up: Progra
* Slices:: Python-style array slices
-Appending '[]' to a built-in or user-defined type yields an array. The
-array element 'i' of an array 'A' can be accessed as 'A[i]'. By
+Appending ‘[]’ to a built-in or user-defined type yields an array. The
+array element ‘i’ of an array ‘A’ can be accessed as ‘A[i]’. By
default, attempts to access or assign to an array element using a
negative index generates an error. Reading an array element with an
index beyond the length of the array also generates an error; however,
assignment to an element beyond the length of the array causes the array
to be resized to accommodate the new element. One can also index an
-array 'A' with an integer array 'B': the array 'A[B]' is formed by
-indexing array 'A' with successive elements of array 'B'. A convenient
+array ‘A’ with an integer array ‘B’: the array ‘A[B]’ is formed by
+indexing array ‘A’ with successive elements of array ‘B’. A convenient
Java-style shorthand exists for iterating over all elements of an array;
see *note array iteration::.
The declaration
real[] A;
-initializes 'A' to be an empty (zero-length) array. Empty arrays should
+initializes ‘A’ to be an empty (zero-length) array. Empty arrays should
be distinguished from null arrays. If we say
real[] A=null;
-then 'A' cannot be dereferenced at all (null arrays have no length and
+then ‘A’ cannot be dereferenced at all (null arrays have no length and
cannot be read from or assigned to).
Arrays can be explicitly initialized like this:
real[] A={0,1,2};
- Array assignment in 'Asymptote' does a shallow copy: only the pointer
-is copied (if one copy if modified, the other will be too). The 'copy'
+ Array assignment in ‘Asymptote’ does a shallow copy: only the pointer
+is copied (if one copy if modified, the other will be too). The ‘copy’
function listed below provides a deep copy of an array.
- Every array 'A' of type 'T[]' has the virtual members
- * 'int length',
- * 'int cyclic',
- * 'int[] keys',
- * 'T push(T x)',
- * 'void append(T[] a)',
- * 'T pop()',
- * 'void insert(int i ... T[] x)',
- * 'void delete(int i, int j=i)',
- * 'void delete()', and
- * 'bool initialized(int n)'.
-
- The member 'A.length' evaluates to the length of the array. Setting
-'A.cyclic=true' signifies that array indices should be reduced modulo
+ Every array ‘A’ of type ‘T[]’ has the virtual members
+ • ‘int length’,
+ • ‘bool cyclic’,
+ • ‘int[] keys’,
+ • ‘T push(T x)’,
+ • ‘void append(T[] a)’,
+ • ‘T pop()’,
+ • ‘void insert(int i ... T[] x)’,
+ • ‘void delete(int i, int j=i)’,
+ • ‘void delete()’, and
+ • ‘bool initialized(int n)’.
+
+ The member ‘A.length’ evaluates to the length of the array. Setting
+‘A.cyclic=true’ signifies that array indices should be reduced modulo
the current array length. Reading from or writing to a nonempty cyclic
array never leads to out-of-bounds errors or array resizing.
- The member 'A.keys' evaluates to an array of integers containing the
+ The member ‘A.keys’ evaluates to an array of integers containing the
indices of initialized entries in the array in ascending order. Hence,
-for an array of length 'n' with all entries initialized, 'A.keys'
-evaluates to '{0,1,...,n-1}'. A new keys array is produced each time
-'A.keys' is evaluated.
-
- The functions 'A.push' and 'A.append' append their arguments onto the
-end of the array, while 'A.insert(int i ... T[] x)' inserts 'x' into the
-array at index 'i'. For convenience 'A.push' returns the pushed item.
-The function 'A.pop()' pops and returns the last element, while
-'A.delete(int i, int j=i)' deletes elements with indices in the range
-['i','j'], shifting the position of all higher-indexed elements down.
-If no arguments are given, 'A.delete()' provides a convenient way of
-deleting all elements of 'A'. The routine 'A.initialized(int n)' can be
-used to examine whether the element at index 'n' is initialized. Like
-all 'Asymptote' functions, 'push', 'append', 'pop', 'insert', 'delete',
-and 'initialized' can be "pulled off" of the array and used on their
+for an array of length ‘n’ with all entries initialized, ‘A.keys’
+evaluates to ‘{0,1,...,n-1}’. A new keys array is produced each time
+‘A.keys’ is evaluated.
+
+ The functions ‘A.push’ and ‘A.append’ append their arguments onto the
+end of the array, while ‘A.insert(int i ... T[] x)’ inserts ‘x’ into the
+array at index ‘i’. For convenience ‘A.push’ returns the pushed item.
+The function ‘A.pop()’ pops and returns the last element, while
+‘A.delete(int i, int j=i)’ deletes elements with indices in the range
+[‘i’,‘j’], shifting the position of all higher-indexed elements down.
+If no arguments are given, ‘A.delete()’ provides a convenient way of
+deleting all elements of ‘A’. The routine ‘A.initialized(int n)’ can be
+used to examine whether the element at index ‘n’ is initialized. Like
+all ‘Asymptote’ functions, ‘push’, ‘append’, ‘pop’, ‘insert’, ‘delete’,
+and ‘initialized’ can be "pulled off" of the array and used on their
own. For example,
int[] A={1};
A.push(2); // A now contains {1,2}.
@@ -4107,111 +4111,111 @@ A.insert(1,3); // A now contains {2,3}.
A.insert(1 ... A); // A now contains {2,2,3,3}
A.insert(2,4,5); // A now contains {2,2,4,5,3,3}.
- The '[]' suffix can also appear after the variable name; this is
+ The ‘[]’ suffix can also appear after the variable name; this is
sometimes convenient for declaring a list of variables and arrays of the
same type:
real a,A[];
-This declares 'a' to be 'real' and implicitly declares 'A' to be of type
-'real[]'.
+This declares ‘a’ to be ‘real’ and implicitly declares ‘A’ to be of type
+‘real[]’.
- In the following list of built-in array functions, 'T' represents a
-generic type. Note that the internal functions 'alias', 'array',
-'copy', 'concat', 'sequence', 'map', and 'transpose', which depend on
-type 'T[]', are defined only after the first declaration of a variable
-of type 'T[]'.
+ In the following list of built-in array functions, ‘T’ represents a
+generic type. Note that the internal functions ‘alias’, ‘array’,
+‘copy’, ‘concat’, ‘sequence’, ‘map’, and ‘transpose’, which depend on
+type ‘T[]’, are defined only after the first declaration of a variable
+of type ‘T[]’.
-'new T[]'
- returns a new empty array of type 'T[]';
+‘new T[]’
+ returns a new empty array of type ‘T[]’;
-'new T[] {list}'
- returns a new array of type 'T[]' initialized with 'list' (a comma
+‘new T[] {list}’
+ returns a new array of type ‘T[]’ initialized with ‘list’ (a comma
delimited list of elements);
-'new T[n]'
- returns a new array of 'n' elements of type 'T[]'. These 'n' array
+‘new T[n]’
+ returns a new array of ‘n’ elements of type ‘T[]’. These ‘n’ array
elements are not initialized unless they are arrays themselves (in
which case they are each initialized to empty arrays);
-'T[] array(int n, T value, int depth=intMax)'
- returns an array consisting of 'n' copies of 'value'. If 'value'
- is itself an array, a deep copy of 'value' is made for each entry.
- If 'depth' is specified, this deep copying only recurses to the
+‘T[] array(int n, T value, int depth=intMax)’
+ returns an array consisting of ‘n’ copies of ‘value’. If ‘value’
+ is itself an array, a deep copy of ‘value’ is made for each entry.
+ If ‘depth’ is specified, this deep copying only recurses to the
specified number of levels;
-'int[] sequence(int n)'
- if 'n >= 1' returns the array '{0,1,...,n-1}' (otherwise returns a
+‘int[] sequence(int n)’
+ if ‘n >= 1’ returns the array ‘{0,1,...,n-1}’ (otherwise returns a
null array);
-'int[] sequence(int n, int m)'
- if 'm >= n' returns an array '{n,n+1,...,m}' (otherwise returns a
+‘int[] sequence(int n, int m)’
+ if ‘m >= n’ returns an array ‘{n,n+1,...,m}’ (otherwise returns a
null array);
-'int[] sequence(int n, int m, int skip)'
- if 'm >= n' returns an array '{n,n+1,...,m}' skipping by 'skip'
+‘int[] sequence(int n, int m, int skip)’
+ if ‘m >= n’ returns an array ‘{n,n+1,...,m}’ skipping by ‘skip’
(otherwise returns a null array);
-'T[] sequence(T f(int), int n)'
- if 'n >= 1' returns the sequence '{f_i :i=0,1,...n-1}' given a
- function 'T f(int)' and integer 'int n' (otherwise returns a null
+‘T[] sequence(T f(int), int n)’
+ if ‘n >= 1’ returns the sequence ‘{f_i :i=0,1,...n-1}’ given a
+ function ‘T f(int)’ and integer ‘int n’ (otherwise returns a null
array);
-'T[] map(T f(T), T[] a)'
- returns the array obtained by applying the function 'f' to each
- element of the array 'a'. This is equivalent to 'sequence(new
- T(int i) {return f(a[i]);},a.length)';
+‘T[] map(T f(T), T[] a)’
+ returns the array obtained by applying the function ‘f’ to each
+ element of the array ‘a’. This is equivalent to ‘sequence(new
+ T(int i) {return f(a[i]);},a.length)’;
-'T2[] map(T2 f(T1), T1[] a)'
- constructed by calling 'mapArray("T1","T2")', returns the array
- obtained by applying the function 'f' to each element of the array
- 'a';
+‘T2[] map(T2 f(T1), T1[] a)’
+ constructed by running ‘from mapArray(Src=T1, Dst=T2) access map;’,
+ returns the array obtained by applying the function ‘f’ to each
+ element of the array ‘a’;
-'int[] reverse(int n)'
- if 'n >= 1' returns the array '{n-1,n-2,...,0}' (otherwise returns
+‘int[] reverse(int n)’
+ if ‘n >= 1’ returns the array ‘{n-1,n-2,...,0}’ (otherwise returns
a null array);
-'int[] complement(int[] a, int n)'
- returns the complement of the integer array 'a' in
- '{0,1,2,...,n-1}', so that 'b[complement(a,b.length)]' yields the
- complement of 'b[a]';
+‘int[] complement(int[] a, int n)’
+ returns the complement of the integer array ‘a’ in
+ ‘{0,1,2,...,n-1}’, so that ‘b[complement(a,b.length)]’ yields the
+ complement of ‘b[a]’;
-'real[] uniform(real a, real b, int n)'
- if 'n >= 1' returns a uniform partition of '[a,b]' into 'n'
+‘real[] uniform(real a, real b, int n)’
+ if ‘n >= 1’ returns a uniform partition of ‘[a,b]’ into ‘n’
subintervals (otherwise returns a null array);
-'int find(bool[] a, int n=1)'
- returns the index of the 'n'th 'true' value in the boolean array
- 'a' or -1 if not found. If 'n' is negative, search backwards from
- the end of the array for the '-n'th value;
+‘int find(bool[] a, int n=1)’
+ returns the index of the ‘n’th ‘true’ value in the boolean array
+ ‘a’ or -1 if not found. If ‘n’ is negative, search backwards from
+ the end of the array for the ‘-n’th value;
-'int[] findall(bool[] a)'
- returns the indices of all 'true' values in the boolean array 'a';
+‘int[] findall(bool[] a)’
+ returns the indices of all ‘true’ values in the boolean array ‘a’;
-'int search(T[] a, T key)'
- For built-in ordered types 'T', searches a sorted array 'a' of 'n'
- elements for k, returning the index 'i' if 'a[i] <= key < a[i+1]',
- '-1' if 'key' is less than all elements of 'a', or 'n-1' if 'key'
- is greater than or equal to the last element of 'a';
+‘int search(T[] a, T key)’
+ For built-in ordered types ‘T’, searches a sorted array ‘a’ of ‘n’
+ elements for k, returning the index ‘i’ if ‘a[i] <= key < a[i+1]’,
+ ‘-1’ if ‘key’ is less than all elements of ‘a’, or ‘n-1’ if ‘key’
+ is greater than or equal to the last element of ‘a’;
-'int search(T[] a, T key, bool less(T i, T j))'
- searches an array 'a' sorted in ascending order such that element
- 'i' precedes element 'j' if 'less(i,j)' is true;
+‘int search(T[] a, T key, bool less(T i, T j))’
+ searches an array ‘a’ sorted in ascending order such that element
+ ‘i’ precedes element ‘j’ if ‘less(i,j)’ is true;
-'T[] copy(T[] a)'
- returns a deep copy of the array 'a';
+‘T[] copy(T[] a)’
+ returns a deep copy of the array ‘a’;
-'T[] concat(... T[][] a)'
+‘T[] concat(... T[][] a)’
returns a new array formed by concatenating the given
one-dimensional arrays given as arguments;
-'bool alias(T[] a, T[] b)'
- returns 'true' if the arrays 'a' and 'b' are identical;
+‘bool alias(T[] a, T[] b)’
+ returns ‘true’ if the arrays ‘a’ and ‘b’ are identical;
-'T[] sort(T[] a)'
- For built-in ordered types 'T', returns a copy of 'a' sorted in
+‘T[] sort(T[] a)’
+ For built-in ordered types ‘T’, returns a copy of ‘a’ sorted in
ascending order;
-'T[][] sort(T[][] a)'
- For built-in ordered types 'T', returns a copy of 'a' with the rows
+‘T[][] sort(T[][] a)’
+ For built-in ordered types ‘T’, returns a copy of ‘a’ with the rows
sorted by the first column, breaking ties with successively higher
columns. For example:
string[][] a={{"bob","9"},{"alice","5"},{"pete","7"},
@@ -4225,53 +4229,53 @@ of type 'T[]'.
bob 9
pete 7
-'T[] sort(T[] a, bool less(T i, T j), bool stable=true)'
- returns a copy of 'a' sorted in ascending order such that element
- 'i' precedes element 'j' if 'less(i,j)' is true, subject to (if
- 'stable' is 'true') the stability constraint that the original
- order of elements 'i' and 'j' is preserved if 'less(i,j)' and
- 'less(j,i)' are both 'false';
+‘T[] sort(T[] a, bool less(T i, T j), bool stable=true)’
+ returns a copy of ‘a’ sorted in ascending order such that element
+ ‘i’ precedes element ‘j’ if ‘less(i,j)’ is true, subject to (if
+ ‘stable’ is ‘true’) the stability constraint that the original
+ order of elements ‘i’ and ‘j’ is preserved if ‘less(i,j)’ and
+ ‘less(j,i)’ are both ‘false’;
-'T[][] transpose(T[][] a)'
- returns the transpose of 'a';
+‘T[][] transpose(T[][] a)’
+ returns the transpose of ‘a’;
-'T[][][] transpose(T[][][] a, int[] perm)'
- returns the 3D transpose of 'a' obtained by applying the
- permutation 'perm' of 'new int[]{0,1,2}' to the indices of each
+‘T[][][] transpose(T[][][] a, int[] perm)’
+ returns the 3D transpose of ‘a’ obtained by applying the
+ permutation ‘perm’ of ‘new int[]{0,1,2}’ to the indices of each
entry;
-'T sum(T[] a)'
- for arithmetic types 'T', returns the sum of 'a'. In the case
- where 'T' is 'bool', the number of true elements in 'a' is
+‘T sum(T[] a)’
+ for arithmetic types ‘T’, returns the sum of ‘a’. In the case
+ where ‘T’ is ‘bool’, the number of true elements in ‘a’ is
returned;
-'T min(T[] a)'
-'T min(T[][] a)'
-'T min(T[][][] a)'
- for built-in ordered types 'T', returns the minimum element of 'a';
+‘T min(T[] a)’
+‘T min(T[][] a)’
+‘T min(T[][][] a)’
+ for built-in ordered types ‘T’, returns the minimum element of ‘a’;
-'T max(T[] a)'
-'T max(T[][] a)'
-'T max(T[][][] a)'
- for built-in ordered types 'T', returns the maximum element of 'a';
+‘T max(T[] a)’
+‘T max(T[][] a)’
+‘T max(T[][][] a)’
+ for built-in ordered types ‘T’, returns the maximum element of ‘a’;
-'T[] min(T[] a, T[] b)'
- for built-in ordered types 'T', and arrays 'a' and 'b' of the same
+‘T[] min(T[] a, T[] b)’
+ for built-in ordered types ‘T’, and arrays ‘a’ and ‘b’ of the same
length, returns an array composed of the minimum of the
- corresponding elements of 'a' and 'b';
+ corresponding elements of ‘a’ and ‘b’;
-'T[] max(T[] a, T[] b)'
- for built-in ordered types 'T', and arrays 'a' and 'b' of the same
+‘T[] max(T[] a, T[] b)’
+ for built-in ordered types ‘T’, and arrays ‘a’ and ‘b’ of the same
length, returns an array composed of the maximum of the
- corresponding elements of 'a' and 'b';
+ corresponding elements of ‘a’ and ‘b’;
-'pair[] pairs(real[] x, real[] y);'
- for arrays 'x' and 'y' of the same length, returns the pair array
- 'sequence(new pair(int i) {return (x[i],y[i]);},x.length)';
+‘pair[] pairs(real[] x, real[] y);’
+ for arrays ‘x’ and ‘y’ of the same length, returns the pair array
+ ‘sequence(new pair(int i) {return (x[i],y[i]);},x.length)’;
-'pair[] fft(pair[] a, int sign=1)'
- returns the unnormalized Fast Fourier Transform of 'a' (if the
- optional 'FFTW' package is installed), using the given 'sign'.
+‘pair[] fft(pair[] a, int sign=1)’
+ returns the unnormalized Fast Fourier Transform of ‘a’ (if the
+ optional ‘FFTW’ package is installed), using the given ‘sign’.
Here is a simple example:
int n=4;
pair[] f=sequence(n);
@@ -4283,45 +4287,45 @@ of type 'T[]'.
write();
write(f/n);
-'pair[][] fft(pair[][] a, int sign=1)'
- returns the unnormalized two-dimensional Fourier transform of 'a'
- using the given 'sign';
+‘pair[][] fft(pair[][] a, int sign=1)’
+ returns the unnormalized two-dimensional Fourier transform of ‘a’
+ using the given ‘sign’;
-'pair[][][] fft(pair[][][] a, int sign=1)'
- returns the unnormalized three-dimensional Fourier transform of 'a'
- using the given 'sign';
+‘pair[][][] fft(pair[][][] a, int sign=1)’
+ returns the unnormalized three-dimensional Fourier transform of ‘a’
+ using the given ‘sign’;
-'realschur schur(real[][] a)'
- returns a struct 'realschur' containing a unitary matrix 'U' and a
- quasitriangular matrix 'T' such that 'a=U*T*transpose(U)';
+‘realschur schur(real[][] a)’
+ returns a struct ‘realschur’ containing a unitary matrix ‘U’ and a
+ quasitriangular matrix ‘T’ such that ‘a=U*T*transpose(U)’;
-'schur schur(pair[][] a)'
- returns a struct 'schur' containing a unitary matrix 'U' and a
- triangular matrix 'T' such that 'a=U*T*conj(transpose(U))';
+‘schur schur(pair[][] a)’
+ returns a struct ‘schur’ containing a unitary matrix ‘U’ and a
+ triangular matrix ‘T’ such that ‘a=U*T*conj(transpose(U))’;
-'real dot(real[] a, real[] b)'
- returns the dot product of the vectors 'a' and 'b';
+‘real dot(real[] a, real[] b)’
+ returns the dot product of the vectors ‘a’ and ‘b’;
-'pair dot(pair[] a, pair[] b)'
- returns the complex dot product 'sum(a*conj(b))' of the vectors 'a'
- and 'b';
+‘pair dot(pair[] a, pair[] b)’
+ returns the complex dot product ‘sum(a*conj(b))’ of the vectors ‘a’
+ and ‘b’;
-'real[] tridiagonal(real[] a, real[] b, real[] c, real[] f);'
- Solve the periodic tridiagonal problem L'x'='f' and return the
- solution 'x', where 'f' is an n vector and L is the n \times n
+‘real[] tridiagonal(real[] a, real[] b, real[] c, real[] f);’
+ Solve the periodic tridiagonal problem L‘x’=‘f’ and return the
+ solution ‘x’, where ‘f’ is an n vector and L is the n \times n
matrix
[ b[0] c[0] a[0] ]
[ a[1] b[1] c[1] ]
[ a[2] b[2] c[2] ]
[ ... ]
[ c[n-1] a[n-1] b[n-1] ]
- For Dirichlet boundary conditions (denoted here by 'u[-1]' and
- 'u[n]'), replace 'f[0]' by 'f[0]-a[0]u[-1]' and
- 'f[n-1]-c[n-1]u[n]'; then set 'a[0]=c[n-1]=0';
+ For Dirichlet boundary conditions (denoted here by ‘u[-1]’ and
+ ‘u[n]’), replace ‘f[0]’ by ‘f[0]-a[0]u[-1]’ and
+ ‘f[n-1]-c[n-1]u[n]’; then set ‘a[0]=c[n-1]=0’;
-'real[] solve(real[][] a, real[] b, bool warn=true)'
- Solve the linear equation 'a'x='b' by LU decomposition and return
- the solution x, where 'a' is an n \times n matrix and 'b' is an
+‘real[] solve(real[][] a, real[] b, bool warn=true)’
+ Solve the linear equation ‘a’x=‘b’ by LU decomposition and return
+ the solution x, where ‘a’ is an n \times n matrix and ‘b’ is an
array of length n. For example:
import math;
real[][] a={{1,-2,3,0},{4,-5,6,2},{-7,-8,10,5},{1,50,1,-2}};
@@ -4331,83 +4335,83 @@ of type 'T[]'.
write(b); write();
write(x); write();
write(a*x);
- If 'a' is a singular matrix and 'warn' is 'false', return an empty
- array. If the matrix 'a' is tridiagonal, the routine 'tridiagonal'
+ If ‘a’ is a singular matrix and ‘warn’ is ‘false’, return an empty
+ array. If the matrix ‘a’ is tridiagonal, the routine ‘tridiagonal’
provides a more efficient algorithm (*note tridiagonal::);
-'real[][] solve(real[][] a, real[][] b, bool warn=true)'
- Solve the linear equation 'a'x='b' and return the solution x, where
- 'a' is an n \times n matrix and 'b' is an n \times m matrix. If
- 'a' is a singular matrix and 'warn' is 'false', return an empty
+‘real[][] solve(real[][] a, real[][] b, bool warn=true)’
+ Solve the linear equation ‘a’x=‘b’ and return the solution x, where
+ ‘a’ is an n \times n matrix and ‘b’ is an n \times m matrix. If
+ ‘a’ is a singular matrix and ‘warn’ is ‘false’, return an empty
matrix;
-'real[][] identity(int n);'
+‘real[][] identity(int n);’
returns the n \times n identity matrix;
-'real[][] diagonal(... real[] a)'
+‘real[][] diagonal(... real[] a)’
returns the diagonal matrix with diagonal entries given by a;
-'real[][] inverse(real[][] a)'
- returns the inverse of a square matrix 'a';
+‘real[][] inverse(real[][] a)’
+ returns the inverse of a square matrix ‘a’;
-'real[] quadraticroots(real a, real b, real c);'
+‘real[] quadraticroots(real a, real b, real c);’
This numerically robust solver returns the real roots of the
quadratic equation ax^2+bx+c=0, in ascending order. Multiple roots
are listed separately;
-'pair[] quadraticroots(explicit pair a, explicit pair b, explicit pair c);'
+‘pair[] quadraticroots(explicit pair a, explicit pair b, explicit pair c);’
This numerically robust solver returns the complex roots of the
quadratic equation ax^2+bx+c=0;
-'real[] cubicroots(real a, real b, real c, real d);'
+‘real[] cubicroots(real a, real b, real c, real d);’
This numerically robust solver returns the real roots of the cubic
equation ax^3+bx^2+cx+d=0. Multiple roots are listed separately.
- 'Asymptote' includes a full set of vectorized array instructions for
+ ‘Asymptote’ includes a full set of vectorized array instructions for
arithmetic (including self) and logical operations. These
element-by-element instructions are implemented in C++ code for speed.
Given
real[] a={1,2};
real[] b={3,2};
-then 'a == b' and 'a >= 2' both evaluate to the vector '{false, true}'.
-To test whether all components of 'a' and 'b' agree, use the boolean
-function 'all(a == b)'. One can also use conditionals like '(a >= 2) ?
-a : b', which returns the array '{3,2}', or 'write((a >= 2) ? a : null',
-which returns the array '{2}'.
+then ‘a == b’ and ‘a >= 2’ both evaluate to the vector ‘{false, true}’.
+To test whether all components of ‘a’ and ‘b’ agree, use the boolean
+function ‘all(a == b)’. One can also use conditionals like ‘(a >= 2) ?
+a : b’, which returns the array ‘{3,2}’, or ‘write((a >= 2) ? a : null’,
+which returns the array ‘{2}’.
- All of the standard built-in 'libm' functions of signature
-'real(real)' also take a real array as an argument, effectively like an
-implicit call to 'map'.
+ All of the standard built-in ‘libm’ functions of signature
+‘real(real)’ also take a real array as an argument, effectively like an
+implicit call to ‘map’.
As with other built-in types, arrays of the basic data types can be
read in by assignment. In this example, the code
file fin=input("test.txt");
real[] A=fin;
-reads real values into 'A' until the end-of-file is reached (or an I/O
+reads real values into ‘A’ until the end-of-file is reached (or an I/O
error occurs).
- The virtual members 'dimension', 'line', 'csv', 'word', and 'read' of
+ The virtual members ‘dimension’, ‘line’, ‘csv’, ‘word’, and ‘read’ of
a file are useful for reading arrays. For example, if line mode is set
-with 'file line(bool b=true)', then reading will stop once the end of
+with ‘file line(bool b=true)’, then reading will stop once the end of
the line is reached instead:
file fin=input("test.txt");
real[] A=fin.line();
Since string reads by default read up to the end of line anyway, line
mode normally has no effect on string array reads. However, there is a
-white-space delimiter mode for reading strings, 'file word(bool
-b=true)', which causes string reads to respect white-space delimiters,
+white-space delimiter mode for reading strings, ‘file word(bool
+b=true)’, which causes string reads to respect white-space delimiters,
instead of the default end-of-line delimiter:
file fin=input("test.txt").line().word();
real[] A=fin;
- Another useful mode is comma-separated-value mode, 'file csv(bool
-b=true)', which causes reads to respect comma delimiters:
+ Another useful mode is comma-separated-value mode, ‘file csv(bool
+b=true)’, which causes reads to respect comma delimiters:
file fin=input("test.txt").csv();
real[] A=fin;
- To restrict the number of values read, use the 'file dimension(int)'
+ To restrict the number of values read, use the ‘file dimension(int)’
function:
file fin=input("test.txt");
real[] A=fin.dimension(10);
@@ -4426,16 +4430,16 @@ real[][][] B=fin.dimension(2,3,4);
Sometimes the array dimensions are stored with the data as integer
fields at the beginning of an array. Such 1, 2, or 3 dimensional arrays
-can be read in with the virtual member functions 'read(1)', 'read(2)',
-or 'read(3)', respectively:
+can be read in with the virtual member functions ‘read(1)’, ‘read(2)’,
+or ‘read(3)’, respectively:
file fin=input("test.txt");
real[] A=fin.read(1);
real[][] B=fin.read(2);
real[][][] C=fin.read(3);
One, two, and three-dimensional arrays of the basic data types can be
-output with the functions 'write(file,T[])', 'write(file,T[][])',
-'write(file,T[][][])', respectively.
+output with the functions ‘write(file,T[])’, ‘write(file,T[][])’,
+‘write(file,T[][][])’, respectively.

File: asymptote.info, Node: Slices, Prev: Arrays, Up: Arrays
@@ -4444,14 +4448,14 @@ File: asymptote.info, Node: Slices, Prev: Arrays, Up: Arrays
-------------
Asymptote allows a section of an array to be addressed as a slice using
-a Python-like syntax. If 'A' is an array, the expression 'A[m:n]'
-returns a new array consisting of the elements of 'A' with indices from
-'m' up to but not including 'n'. For example,
+a Python-like syntax. If ‘A’ is an array, the expression ‘A[m:n]’
+returns a new array consisting of the elements of ‘A’ with indices from
+‘m’ up to but not including ‘n’. For example,
int[] x={0,1,2,3,4,5,6,7,8,9};
int[] y=x[2:6]; // y={2,3,4,5};
int[] z=x[5:10]; // z={5,6,7,8,9};
- If the left index is omitted, it is taken be '0'. If the right index
+ If the left index is omitted, it is taken be ‘0’. If the right index
is omitted it is taken to be the length of the array. If both are
omitted, the slice then goes from the start of the array to the end,
producing a non-cyclic deep copy of the array. For example:
@@ -4464,8 +4468,8 @@ int[] w=x[:]; // w={0,1,2,3,4,5,6,7,8,9}, distinct from array x.
either of the indices. If the indices exceed the length of the array,
however, they are politely truncated to that length.
- For cyclic arrays, the slice 'A[m:n]' still consists of the cells
-with indices in the set ['m','n'), but now negative values and values
+ For cyclic arrays, the slice ‘A[m:n]’ still consists of the cells
+with indices in the set [‘m’,‘n’), but now negative values and values
beyond the length of the array are allowed. The indices simply wrap
around. For example:
@@ -4497,26 +4501,26 @@ toppings[0:3]=new string[] {"tomato"};
// Now toppings={"tomato", "bacon", "lettuce"}
If an array is assigned to a slice of itself, a copy of the original
-array is assigned to the slice. That is, code such as 'x[m:n]=x' is
-equivalent to 'x[m:n]=copy(x)'. One can use the shorthand 'x[m:m]=y' to
-insert the contents of the array 'y' into the array 'x' starting at the
-location just before 'x[m]'.
+array is assigned to the slice. That is, code such as ‘x[m:n]=x’ is
+equivalent to ‘x[m:n]=copy(x)’. One can use the shorthand ‘x[m:m]=y’ to
+insert the contents of the array ‘y’ into the array ‘x’ starting at the
+location just before ‘x[m]’.
For a cyclic array, a slice is bridging if it addresses cells up to
the end of the array and then continues on to address cells at the start
-of the array. For instance, if 'A' is a cyclic array of length 10,
-'A[8:12]', 'A[-3:1]', and 'A[5:25]' are bridging slices whereas
-'A[3:7]', 'A[7:10]', 'A[-3:0]' and 'A[103:107]' are not. Bridging
+of the array. For instance, if ‘A’ is a cyclic array of length 10,
+‘A[8:12]’, ‘A[-3:1]’, and ‘A[5:25]’ are bridging slices whereas
+‘A[3:7]’, ‘A[7:10]’, ‘A[-3:0]’ and ‘A[103:107]’ are not. Bridging
slices can only be assigned to if the number of elements in the slice is
exactly equal to the number of elements we are assigning to it.
Otherwise, there is no clear way to decide which of the new entries
-should be 'A[0]' and an error is reported. Non-bridging slices may be
+should be ‘A[0]’ and an error is reported. Non-bridging slices may be
assigned an array of any length.
- For a cyclic array 'A' an expression of the form
-'A[A.length:A.length]' is equivalent to the expression 'A[0:0]' and so
+ For a cyclic array ‘A’ an expression of the form
+‘A[A.length:A.length]’ is equivalent to the expression ‘A[0:0]’ and so
assigning to this slice will insert values at the start of the array.
-'A.append()' can be used to insert values at the end of the array.
+‘A.append()’ can be used to insert values at the end of the array.
It is illegal to assign to a slice of a cyclic array that repeats any
of the cells.
@@ -4527,14 +4531,14 @@ File: asymptote.info, Node: Casts, Next: Import, Prev: Arrays, Up: Programmi
6.13 Casts
==========
-'Asymptote' implicitly casts 'int' to 'real', 'int' to 'pair', 'real' to
-'pair', 'pair' to 'path', 'pair' to 'guide', 'path' to 'guide', 'guide'
-to 'path', 'real' to 'pen', 'pair[]' to 'guide[]', 'pair[]' to 'path[]',
-'path' to 'path[]', and 'guide' to 'path[]', along with various
-three-dimensional casts defined in module 'three'. Implicit casts are
+‘Asymptote’ implicitly casts ‘int’ to ‘real’, ‘int’ to ‘pair’, ‘real’ to
+‘pair’, ‘pair’ to ‘path’, ‘pair’ to ‘guide’, ‘path’ to ‘guide’, ‘guide’
+to ‘path’, ‘real’ to ‘pen’, ‘pair[]’ to ‘guide[]’, ‘pair[]’ to ‘path[]’,
+‘path’ to ‘path[]’, and ‘guide’ to ‘path[]’, along with various
+three-dimensional casts defined in module ‘three’. Implicit casts are
automatically attempted on assignment and when trying to match function
calls with possible function signatures. Implicit casting can be
-inhibited by declaring individual arguments 'explicit' in the function
+inhibited by declaring individual arguments ‘explicit’ in the function
signature, say to avoid an ambiguous function call in the following
example, which outputs 0:
int f(pair a) {return 0;}
@@ -4542,7 +4546,7 @@ int f(explicit real x) {return 1;}
write(f(0));
- Other conversions, say 'real' to 'int' or 'real' to 'string', require
+ Other conversions, say ‘real’ to ‘int’ or ‘real’ to ‘string’, require
an explicit cast:
int i=(int) 2.5;
string s=(string) 2.5;
@@ -4550,16 +4554,16 @@ string s=(string) 2.5;
real[] a={2.5,-3.5};
int[] b=(int []) a;
write(stdout,b); // Outputs 2,-3
- In situations where casting from a string to a type 'T' fails, an
+ In situations where casting from a string to a type ‘T’ fails, an
uninitialized variable is returned; this condition can be detected with
-the function 'bool initialized(T);'
+the function ‘bool initialized(T);’
int i=(int) "2.5";
assert(initialized(i),"Invalid cast.");
real x=(real) "2.5a";
assert(initialized(x),"Invalid cast.");
- Casting to user-defined types is also possible using 'operator cast':
+ Casting to user-defined types is also possible using ‘operator cast’:
struct rpair {
real radius;
real angle;
@@ -4580,13 +4584,13 @@ some code one wants all integers to represent multiples of 100. To
convert them to reals, one would first want to multiply them by 100.
However, the straightforward implementation
real operator cast(int x) {return x*100;}
-is equivalent to an infinite recursion, since the result 'x*100' needs
+is equivalent to an infinite recursion, since the result ‘x*100’ needs
itself to be cast from an integer to a real. Instead, we want to use
the standard conversion of int to real:
real convert(int x) {return x*100;}
real operator cast(int x)=convert;
- Explicit casts are implemented similarly, with 'operator ecast'.
+ Explicit casts are implemented similarly, with ‘operator ecast’.

File: asymptote.info, Node: Import, Next: Static, Prev: Casts, Up: Programming
@@ -4594,21 +4598,21 @@ File: asymptote.info, Node: Import, Next: Static, Prev: Casts, Up: Programmi
6.14 Import
===========
-While 'Asymptote' provides many features by default, some applications
-require specialized features contained in external 'Asymptote' modules.
+While ‘Asymptote’ provides many features by default, some applications
+require specialized features contained in external ‘Asymptote’ modules.
For instance, the lines
access graph;
graph.axes();
draw x and y axes on a two-dimensional graph. Here, the command looks
-up the module under the name 'graph' in a global dictionary of modules
-and puts it in a new variable named 'graph'. The module is a structure,
+up the module under the name ‘graph’ in a global dictionary of modules
+and puts it in a new variable named ‘graph’. The module is a structure,
and we can refer to its fields as we usually would with a structure.
Often, one wants to use module functions without having to specify
the module name. The code
from graph access axes;
-adds the 'axes' field of 'graph' into the local name space, so that
-subsequently, one can just write 'axes()'. If the given name is
+adds the ‘axes’ field of ‘graph’ into the local name space, so that
+subsequently, one can just write ‘axes()’. If the given name is
overloaded, all types and variables of that name are added. To add more
than one name, just use a comma-separated list:
from graph access axes, xaxis, yaxis;
@@ -4618,7 +4622,7 @@ of a module to the local name space:
from graph access *;
Similarly, one can add the non-private fields and types of a
-structure to the local environment with the 'unravel' keyword:
+structure to the local environment with the ‘unravel’ keyword:
struct matrix {
real a,b,c,d;
}
@@ -4638,8 +4642,8 @@ import graph;
is a convenient abbreviation for the commands
access graph;
unravel graph;
- That is, 'import graph' first loads a module into a structure called
-'graph' and then adds its non-private fields and types to the local
+ That is, ‘import graph’ first loads a module into a structure called
+‘graph’ and then adds its non-private fields and types to the local
environment. This way, if a member variable (or function) is
overwritten with a local variable (or function of the same signature),
the original one can still be accessed by qualifying it with the module
@@ -4648,15 +4652,15 @@ name.
Wild card importing will work fine in most cases, but one does not
usually know all of the internal types and variables of a module, which
can also change as the module writer adds or changes features of the
-module. As such, it is prudent to add 'import' commands at the start of
-an 'Asymptote' file, so that imported names won't shadow locally defined
+module. As such, it is prudent to add ‘import’ commands at the start of
+an ‘Asymptote’ file, so that imported names won’t shadow locally defined
functions. Still, imported names may shadow other imported names,
depending on the order in which they were imported, and imported
functions may cause overloading resolution problems if they have the
same name as local functions defined later.
To rename modules or fields when adding them to the local
-environment, use 'as':
+environment, use ‘as’:
access graph as graph2d;
from graph access xaxis as xline, yaxis as yline;
@@ -4666,9 +4670,9 @@ import graph as graph2d;
access graph as graph2d;
unravel graph2d;
- Except for a few built-in modules, such as 'settings', all modules
-are implemented as 'Asymptote' files. When looking up a module that has
-not yet been loaded, 'Asymptote' searches the standard search paths
+ Except for a few built-in modules, such as ‘settings’, all modules
+are implemented as ‘Asymptote’ files. When looking up a module that has
+not yet been loaded, ‘Asymptote’ searches the standard search paths
(*note Search paths::) for the matching file. The file corresponding to
that name is read and the code within it is interpreted as the body of a
structure defining the module.
@@ -4676,64 +4680,110 @@ structure defining the module.
If the file name contains nonalphanumeric characters, enclose it with
quotation marks:
-'access "/usr/local/share/asymptote/graph.asy" as graph;'
+‘access "/usr/local/share/asymptote/graph.asy" as graph;’
-'from "/usr/local/share/asymptote/graph.asy" access axes;'
+‘from "/usr/local/share/asymptote/graph.asy" access axes;’
-'import "/usr/local/share/asymptote/graph.asy" as graph;'
+‘import "/usr/local/share/asymptote/graph.asy" as graph;’
- If 'Asymptote' is compiled with support for 'libcurl', the file name
-can even be a URL: 'import
+ If ‘Asymptote’ is compiled with support for ‘libcurl’, the file name
+can even be a URL: ‘import
"https://raw.githubusercontent.com/vectorgraphics/asymptote/HEAD/doc/axis3.asy"
-as axis3;'
+as axis3;’
It is an error if modules import themselves (or each other in a
cycle). The module name to be imported must be known at compile time.
- However, you can import an 'Asymptote' module determined by the
-string 's' at runtime like this:
+ However, you can import an ‘Asymptote’ module determined by the
+string ‘s’ at runtime like this:
eval("import "+s,true);
To conditionally execute an array of asy files, use
void asy(string format, bool overwrite ... string[] s);
- The file will only be processed, using output format 'format', if
-overwrite is 'true' or the output file is missing.
+ The file will only be processed, using output format ‘format’, if
+overwrite is ‘true’ or the output file is missing.
- One can evaluate an 'Asymptote' expression (without any return value,
-however) contained in the string 's' with:
+ One can evaluate an ‘Asymptote’ expression (without any return value,
+however) contained in the string ‘s’ with:
void eval(string s, bool embedded=false);
- It is not necessary to terminate the string 's' with a semicolon. If
-'embedded' is 'true', the string will be evaluated at the top level of
-the current environment. If 'embedded' is 'false' (the default), the
+ It is not necessary to terminate the string ‘s’ with a semicolon. If
+‘embedded’ is ‘true’, the string will be evaluated at the top level of
+the current environment. If ‘embedded’ is ‘false’ (the default), the
string will be evaluated in an independent environment, sharing the same
-'settings' module (*note settings::).
+‘settings’ module (*note settings::).
- One can evaluate arbitrary 'Asymptote' code (which may contain
+ One can evaluate arbitrary ‘Asymptote’ code (which may contain
unescaped quotation marks) with the command
void eval(code s, bool embedded=false);
- Here 'code' is a special type used with 'quote {}' to enclose
-'Asymptote code' like this:
+ Here ‘code’ is a special type used with ‘quote {}’ to enclose
+‘Asymptote code’ like this:
real a=1;
code s=quote {
write(a);
};
eval(s,true); // Outputs 1
- One application of 'eval' is the creation of parametrized Asymptote
-code, such as a map from one type to another (*note map::).
-
- To include the contents of an existing file 'graph' verbatim (as if
+ To include the contents of an existing file ‘graph’ verbatim (as if
the contents of the file were inserted at that point), use one of the
forms:
include graph;
-'include "/usr/local/share/asymptote/graph.asy";'
+‘include "/usr/local/share/asymptote/graph.asy";’
To list all global functions and variables defined in a module named
-by the contents of the string 's', use the function
+by the contents of the string ‘s’, use the function
void list(string s, bool imports=false);
-Imported global functions and variables are also listed if 'imports' is
-'true'.
+Imported global functions and variables are also listed if ‘imports’ is
+‘true’.
+
+* Menu:
+
+* Templated imports::
+
+
+File: asymptote.info, Node: Templated imports, Up: Import
+
+6.14.1 Templated imports
+------------------------
+
+*Warning:* This feature is experimental: it has known issues and its
+behavior may change in the future.
+
+ In Asymptote, it is possible to create modules that must have one or
+more types specified when they are imported. The first executable line
+of any such module must be of the form ‘typedef import(<types>)’, where
+‘<types>’ is a list of required type parameters. For instance,
+typedef import(T, S, Number);
+could be the first line of a module that requires three type parameters.
+The remaining code in the module can then use ‘T’, ‘S’, and ‘Number’ as
+types.
+
+ To import such a module, one must specify the types to be used. For
+instance, if the module above were named ‘templatedModule’, it could be
+accessed for types ‘string’, ‘int[]’, and ‘real’ with the import command
+access templatedModule(T=string, S=int[], Number=real)
+ as templatedModule_string_int_real;
+Note that this is actually an _access_ command rather than an _import_
+command, so the names of types, functions, etc. would have to be stated
+as e.g. ‘templatedModule_string_int_real.Wrapper_Number’ rather than
+just ‘Wrapper_Number’ (where ‘Wrapper_Number’ is a type defined in
+‘templatedModule.asy’).
+
+ Alternatively, the module could be imported via a command like
+from templatedModule(T=string, S=int[], Number=real) access
+ Wrapper_Number as Wrapper_real,
+ operator ==;
+This command would automatically rename ‘Wrapper_Number’ to
+‘Wrapper_real’ and would also allow the use of any ‘operator ==’
+overloads defined in the module.
+
+ For more information, see the examples in
+<https://github.com/vectorgraphics/asymptote/tree/647b6c5732ec94a48f0f0b2446f02c86888fe7e7/tests/template>.
+
+ Issues: Certain standard features of almost any type (such as ‘==’,
+‘new’, and the ability to call static methods on the type) may only be
+available for type arguments that are builtin or defined in the ‘plain’
+module.

File: asymptote.info, Node: Static, Prev: Import, Up: Programming
@@ -4754,8 +4804,8 @@ struct s {
}
}
-there is one instance of the variable 'c' for each object 's' (as
-opposed to each call of 'count').
+there is one instance of the variable ‘c’ for each object ‘s’ (as
+opposed to each call of ‘count’).
Similarly, in
int factorial(int n) {
@@ -4767,8 +4817,8 @@ int factorial(int n) {
return helper(n);
}
-there is one instance of 'x' for every call to 'factorial' (and not for
-every call to 'helper'), so this is a correct, but ugly, implementation
+there is one instance of ‘x’ for every call to ‘factorial’ (and not for
+every call to ‘helper’), so this is a correct, but ugly, implementation
of factorial.
Similarly, a static variable declared within a structure is allocated
@@ -4779,7 +4829,7 @@ struct A {
}
}
-creates one object 'z' for each object of type 'A' created.
+creates one object ‘z’ for each object of type ‘A’ created.
In this example,
int pow(int n, int k) {
@@ -4796,7 +4846,7 @@ int pow(int n, int k) {
return A.x;
}
-there is one instance of 'x' for each call to 'pow', so this is an ugly
+there is one instance of ‘x’ for each call to ‘pow’, so this is an ugly
implementation of exponentiation.
Loop constructs allocate a new frame in every iteration. This is so
@@ -4811,8 +4861,8 @@ for(int i=0; i < 10; ++i) {
}
f();
- Here, every iteration of the loop has its own variable 'x', so 'f()'
-will write '5'. If a variable in a loop is declared static, it will be
+ Here, every iteration of the loop has its own variable ‘x’, so ‘f()’
+will write ‘5’. If a variable in a loop is declared static, it will be
allocated where the enclosing function or structure was defined (just as
if it were declared static outside of the loop). For instance, in:
void f() {
@@ -4821,8 +4871,8 @@ void f() {
static int y;
}
}
-both 'x' and 'y' will be allocated in the same place, which is also
-where 'f' is allocated.
+both ‘x’ and ‘y’ will be allocated in the same place, which is also
+where ‘f’ is allocated.
Statements may also be declared static, in which case they are run at
the place where the enclosing function or structure is defined.
@@ -4840,7 +4890,7 @@ struct A {
pair A;
int y=A.x;
-does the 'A' in 'A.x' refer to the structure or to the pair variable.
+does the ‘A’ in ‘A.x’ refer to the structure or to the pair variable.
It is the convention in Asymptote that, if there is a non-function
variable with the same name as the qualifier, the qualifier refers to
that variable, and not to the type. This is regardless of what fields
@@ -4849,21 +4899,21 @@ the variable actually possesses.

File: asymptote.info, Node: LaTeX usage, Next: Base modules, Prev: Programming, Up: Top
-7 'LaTeX' usage
+7 ‘LaTeX’ usage
***************
-'Asymptote' comes with a convenient 'LaTeX' style file 'asymptote.sty'
-(v1.36 or later required) that makes 'LaTeX' 'Asymptote'-aware.
-Entering 'Asymptote' code directly into the 'LaTeX' source file, at the
+‘Asymptote’ comes with a convenient ‘LaTeX’ style file ‘asymptote.sty’
+(v1.36 or later required) that makes ‘LaTeX’ ‘Asymptote’-aware.
+Entering ‘Asymptote’ code directly into the ‘LaTeX’ source file, at the
point where it is needed, keeps figures organized and avoids the need to
invent new file names for each figure. Simply add the line
-'\usepackage{asymptote}' at the beginning of your file and enclose your
-'Asymptote' code within a '\begin{asy}...\end{asy}' environment. As
-with the 'LaTeX' 'comment' environment, the '\end{asy}' command must
+‘\usepackage{asymptote}’ at the beginning of your file and enclose your
+‘Asymptote’ code within a ‘\begin{asy}...\end{asy}’ environment. As
+with the ‘LaTeX’ ‘comment’ environment, the ‘\end{asy}’ command must
appear on a line by itself, with no trailing commands/comments. A blank
-line is not allowed after '\begin{asy}'.
+line is not allowed after ‘\begin{asy}’.
- The sample 'LaTeX' file below, named 'latexusage.tex', can be run as
+ The sample ‘LaTeX’ file below, named ‘latexusage.tex’, can be run as
follows:
latex latexusage
asy latexusage-*.asy
@@ -4873,50 +4923,47 @@ or
pdflatex latexusage
asy latexusage-*.asy
pdflatex latexusage
-To switch between using inline Asymptote code with 'latex' and
-'pdflatex' you may first need to remove the files 'latexusage-*.tex'.
+To switch between using inline Asymptote code with ‘latex’ and
+‘pdflatex’ you may first need to remove the files ‘latexusage-*.tex’.
- An even better method for processing a 'LaTeX' file with embedded
-'Asymptote' code is to use the 'latexmk' utility from
+ An even better method for processing a ‘LaTeX’ file with embedded
+‘Asymptote’ code is to use the ‘latexmk’ utility from
<http://mirror.ctan.org/support/latexmk/>
after putting the contents of
<https://raw.githubusercontent.com/vectorgraphics/asymptote/HEAD/doc/latexmkrc>
-in a file 'latexmkrc' in the same directory. The command
+in a file ‘latexmkrc’ in the same directory. The command
latexmk -pdf latexusage
-will then call 'Asymptote' automatically, recompiling only the figures
+will then call ‘Asymptote’ automatically, recompiling only the figures
that have changed. Since each figure is compiled in a separate system
process, this method also tends to use less memory. To store the
-figures in a separate directory named 'asy', one can define
+figures in a separate directory named ‘asy’, one can define
\def\asydir{asy}
- in 'latexusage.tex' and put the contents of
-<https://raw.githubusercontent.com/vectorgraphics/asymptote/HEAD/doc/latexmkrc_asydir>
-in a file 'latexmkrc' in the same directory. External 'Asymptote' code
-can be included with
+ in ‘latexusage.tex’. External ‘Asymptote’ code can be included with
\asyinclude[<options>]{<filename.asy>}
-so that 'latexmk' will recognize when the code is changed. Note that
-'latexmk' requires 'perl', available from <https://www.perl.org/>.
+so that ‘latexmk’ will recognize when the code is changed. Note that
+‘latexmk’ requires ‘perl’, available from <https://www.perl.org/>.
- One can specify 'width', 'height', 'keepAspect', 'viewportwidth',
-'viewportheight', 'attach', and 'inline'. 'keyval'-style options to the
-'asy' and 'asyinclude' environments. Three-dimensional PRC files may
+ One can specify ‘width’, ‘height’, ‘keepAspect’, ‘viewportwidth’,
+‘viewportheight’, ‘attach’, and ‘inline’. ‘keyval’-style options to the
+‘asy’ and ‘asyinclude’ environments. Three-dimensional PRC files may
either be embedded within the page (the default) or attached as
-annotated (but printable) attachments, using the 'attach' option and the
-'attachfile2' (or older 'attachfile') 'LaTeX' package. The 'inline'
-option generates inline 'LaTeX' code instead of EPS or PDF files. This
-makes 2D LaTeX symbols visible to the '\begin{asy}...\end{asy}'
+annotated (but printable) attachments, using the ‘attach’ option and the
+‘attachfile2’ (or older ‘attachfile’) ‘LaTeX’ package. The ‘inline’
+option generates inline ‘LaTeX’ code instead of EPS or PDF files. This
+makes 2D LaTeX symbols visible to the ‘\begin{asy}...\end{asy}’
environment. In this mode, Asymptote correctly aligns 2D LaTeX symbols
-defined outside of '\begin{asy}...\end{asy}', but treats their size as
-zero; an optional second string can be given to 'Label' to provide an
+defined outside of ‘\begin{asy}...\end{asy}’, but treats their size as
+zero; an optional second string can be given to ‘Label’ to provide an
estimate of the unknown label size.
- Note that if the 'latex' TeX engine is used with the 'inline' option,
+ Note that if the ‘latex’ TeX engine is used with the ‘inline’ option,
labels might not show up in DVI viewers that cannot handle raw
-'PostScript' code. One can use 'dvips'/'dvipdf' to produce
-'PostScript'/PDF output (we recommend using the modified version of
-'dvipdf' in the 'Asymptote' patches directory, which accepts the 'dvips
--z' hyperdvi option).
+‘PostScript’ code. One can use ‘dvips’/‘dvipdf’ to produce
+‘PostScript’/PDF output (we recommend using the modified version of
+‘dvipdf’ in the ‘Asymptote’ patches directory, which accepts the ‘dvips
+-z’ hyperdvi option).
- Here now is 'latexusage.tex':
+ Here now is ‘latexusage.tex’:
\documentclass[12pt]{article}
% Use this form to include EPS (latex) or PDF (pdflatex) files:
@@ -5045,13 +5092,13 @@ File: asymptote.info, Node: Base modules, Next: Options, Prev: LaTeX usage,
8 Base modules
**************
-'Asymptote' currently ships with the following base modules:
+‘Asymptote’ currently ships with the following base modules:
* Menu:
-* plain:: Default 'Asymptote' base file
+* plain:: Default ‘Asymptote’ base file
* simplex:: Linear programming: simplex method
-* math:: Extend 'Asymptote''s math capabilities
+* math:: Extend ‘Asymptote’’s math capabilities
* interpolate:: Interpolation routines
* geometry:: Geometry routines
* trembling:: Wavy lines
@@ -5067,9 +5114,9 @@ File: asymptote.info, Node: Base modules, Next: Options, Prev: LaTeX usage,
* roundedpath:: Round the sharp corners of paths
* animation:: Embedded PDF and MPEG movies
* embed:: Embedding movies, sounds, and 3D objects
-* slide:: Making presentations with 'Asymptote'
-* MetaPost:: 'MetaPost' compatibility routines
-* babel:: Interface to 'LaTeX' 'babel' package
+* slide:: Making presentations with ‘Asymptote’
+* MetaPost:: ‘MetaPost’ compatibility routines
+* babel:: Interface to ‘LaTeX’ ‘babel’ package
* labelpath:: Drawing curved labels
* labelpath3:: Drawing curved labels in 3D
* annotate:: Annotate your PDF files
@@ -5092,118 +5139,118 @@ File: asymptote.info, Node: Base modules, Next: Options, Prev: LaTeX usage,

File: asymptote.info, Node: plain, Next: simplex, Prev: Base modules, Up: Base modules
-8.1 'plain'
+8.1 ‘plain’
===========
-This is the default 'Asymptote' base file, which defines key parts of
-the drawing language (such as the 'picture' structure).
+This is the default ‘Asymptote’ base file, which defines key parts of
+the drawing language (such as the ‘picture’ structure).
- By default, an implicit 'private import plain;' occurs before
+ By default, an implicit ‘private import plain;’ occurs before
translating a file and before the first command given in interactive
mode. This also applies when translating files for module definitions
-(except when translating 'plain', of course). This means that the types
-and functions defined in 'plain' are accessible in almost all
-'Asymptote' code. Use the '-noautoplain' command-line option to disable
+(except when translating ‘plain’, of course). This means that the types
+and functions defined in ‘plain’ are accessible in almost all
+‘Asymptote’ code. Use the ‘-noautoplain’ command-line option to disable
this feature.

File: asymptote.info, Node: simplex, Next: math, Prev: plain, Up: Base modules
-8.2 'simplex'
+8.2 ‘simplex’
=============
This module solves the two-variable linear programming problem using the
-simplex method. It is used by the module 'plain' for automatic sizing
+simplex method. It is used by the module ‘plain’ for automatic sizing
of pictures.

File: asymptote.info, Node: math, Next: interpolate, Prev: simplex, Up: Base modules
-8.3 'math'
+8.3 ‘math’
==========
-This module extends 'Asymptote''s mathematical capabilities with useful
+This module extends ‘Asymptote’’s mathematical capabilities with useful
functions such as
-'void drawline(picture pic=currentpicture, pair P, pair Q, pen p=currentpen);'
- draw the visible portion of the (infinite) line going through 'P'
- and 'Q', without altering the size of picture 'pic', using pen 'p'.
+‘void drawline(picture pic=currentpicture, pair P, pair Q, pen p=currentpen);’
+ draw the visible portion of the (infinite) line going through ‘P’
+ and ‘Q’, without altering the size of picture ‘pic’, using pen ‘p’.
-'real intersect(triple P, triple Q, triple n, triple Z);'
+‘real intersect(triple P, triple Q, triple n, triple Z);’
returns the intersection time of the extension of the line segment
- 'PQ' with the plane perpendicular to 'n' and passing through 'Z'.
+ ‘PQ’ with the plane perpendicular to ‘n’ and passing through ‘Z’.
-'triple intersectionpoint(triple n0, triple P0, triple n1, triple P1);'
+‘triple intersectionpoint(triple n0, triple P0, triple n1, triple P1);’
Return any point on the intersection of the two planes with normals
- 'n0' and 'n1' passing through points 'P0' and 'P1', respectively.
- If the planes are parallel, return '(infinity,infinity,infinity)'.
+ ‘n0’ and ‘n1’ passing through points ‘P0’ and ‘P1’, respectively.
+ If the planes are parallel, return ‘(infinity,infinity,infinity)’.
-'pair[] quarticroots(real a, real b, real c, real d, real e);'
+‘pair[] quarticroots(real a, real b, real c, real d, real e);’
returns the four complex roots of the quartic equation
ax^4+bx^3+cx^2+dx+e=0.
-'real time(path g, real x, int n=0, real fuzz=-1)'
- returns the 'n'th intersection time of path 'g' with the vertical
+‘real time(path g, real x, int n=0, real fuzz=-1)’
+ returns the ‘n’th intersection time of path ‘g’ with the vertical
line through x.
-'real time(path g, explicit pair z, int n=0, real fuzz=-1)'
- returns the 'n'th intersection time of path 'g' with the horizontal
- line through '(0,z.y)'.
+‘real time(path g, explicit pair z, int n=0, real fuzz=-1)’
+ returns the ‘n’th intersection time of path ‘g’ with the horizontal
+ line through ‘(0,z.y)’.
-'real value(path g, real x, int n=0, real fuzz=-1)'
- returns the 'n'th 'y' value of 'g' at 'x'.
+‘real value(path g, real x, int n=0, real fuzz=-1)’
+ returns the ‘n’th ‘y’ value of ‘g’ at ‘x’.
-'real value(path g, explicit pair z, int n=0, real fuzz=-1)'
- returns the 'n'th 'x' value of 'g' at 'y=z.y'.
+‘real value(path g, explicit pair z, int n=0, real fuzz=-1)’
+ returns the ‘n’th ‘x’ value of ‘g’ at ‘y=z.y’.
-'real slope(path g, real x, int n=0, real fuzz=-1)'
- returns the 'n'th slope of 'g' at 'x'.
+‘real slope(path g, real x, int n=0, real fuzz=-1)’
+ returns the ‘n’th slope of ‘g’ at ‘x’.
-'real slope(path g, explicit pair z, int n=0, real fuzz=-1)'
- returns the 'n'th slope of 'g' at 'y=z.y'.
+‘real slope(path g, explicit pair z, int n=0, real fuzz=-1)’
+ returns the ‘n’th slope of ‘g’ at ‘y=z.y’.
int[][] segment(bool[] b) returns the indices of consecutive
- true-element segments of bool[] 'b'.
+ true-element segments of bool[] ‘b’.
-'real[] partialsum(real[] a)'
- returns the partial sums of a real array 'a'.
+‘real[] partialsum(real[] a)’
+ returns the partial sums of a real array ‘a’.
-'real[] partialsum(real[] a, real[] dx)'
- returns the partial 'dx'-weighted sums of a real array 'a'.
+‘real[] partialsum(real[] a, real[] dx)’
+ returns the partial ‘dx’-weighted sums of a real array ‘a’.
-'bool increasing(real[] a, bool strict=false)'
- returns, if 'strict=false', whether 'i > j' implies 'a[i] >= a[j]',
- or if 'strict=true', whether 'i > j' implies implies 'a[i] > a[j]'.
+‘bool increasing(real[] a, bool strict=false)’
+ returns, if ‘strict=false’, whether ‘i > j’ implies ‘a[i] >= a[j]’,
+ or if ‘strict=true’, whether ‘i > j’ implies implies ‘a[i] > a[j]’.
-'int unique(real[] a, real x)'
- if the sorted array 'a' does not contain 'x', insert it
- sequentially, returning the index of 'x' in the resulting array.
+‘int unique(real[] a, real x)’
+ if the sorted array ‘a’ does not contain ‘x’, insert it
+ sequentially, returning the index of ‘x’ in the resulting array.
-'bool lexorder(pair a, pair b)'
- returns the strict lexicographical partial order of 'a' and 'b'.
+‘bool lexorder(pair a, pair b)’
+ returns the strict lexicographical partial order of ‘a’ and ‘b’.
-'bool lexorder(triple a, triple b)'
- returns the strict lexicographical partial order of 'a' and 'b'.
+‘bool lexorder(triple a, triple b)’
+ returns the strict lexicographical partial order of ‘a’ and ‘b’.

File: asymptote.info, Node: interpolate, Next: geometry, Prev: math, Up: Base modules
-8.4 'interpolate'
+8.4 ‘interpolate’
=================
This module implements Lagrange, Hermite, and standard cubic spline
-interpolation in 'Asymptote', as illustrated in the example
-'interpolate1.asy'.
+interpolation in ‘Asymptote’, as illustrated in the example
+‘interpolate1.asy’.

File: asymptote.info, Node: geometry, Next: trembling, Prev: interpolate, Up: Base modules
-8.5 'geometry'
+8.5 ‘geometry’
==============
This module, written by Philippe Ivaldi, provides an extensive set of
-geometry routines, including 'perpendicular' symbols and a 'triangle'
-structure. Link to the documentation for the 'geometry' module are
+geometry routines, including ‘perpendicular’ symbols and a ‘triangle’
+structure. Link to the documentation for the ‘geometry’ module are
posted here: <https://asymptote.sourceforge.io/links.html>, including an
extensive set of examples,
<https://web.archive.org/web/20201130113133/http://www.piprime.fr/files/asymptote/geometry/>,
@@ -5213,45 +5260,45 @@ and an index:

File: asymptote.info, Node: trembling, Next: stats, Prev: geometry, Up: Base modules
-8.6 'trembling'
+8.6 ‘trembling’
===============
This module, written by Philippe Ivaldi and illustrated in the example
-'floatingdisk.asy', allows one to draw wavy lines, as if drawn by hand.
+‘floatingdisk.asy’, allows one to draw wavy lines, as if drawn by hand.

File: asymptote.info, Node: stats, Next: patterns, Prev: trembling, Up: Base modules
-8.7 'stats'
+8.7 ‘stats’
===========
This module implements a Gaussian random number generator and a
-collection of statistics routines, including 'histogram' and
-'leastsquares'.
+collection of statistics routines, including ‘histogram’ and
+‘leastsquares’.

File: asymptote.info, Node: patterns, Next: markers, Prev: stats, Up: Base modules
-8.8 'patterns'
+8.8 ‘patterns’
==============
-This module implements 'PostScript' tiling patterns and includes several
+This module implements ‘PostScript’ tiling patterns and includes several
convenient pattern generation routines.

File: asymptote.info, Node: markers, Next: map, Prev: patterns, Up: Base modules
-8.9 'markers'
+8.9 ‘markers’
=============
This module implements specialized routines for marking paths and
angles. The principal mark routine provided by this module is
markroutine markinterval(int n=1, frame f, bool rotated=false);
-which centers 'n' copies of frame 'f' within uniformly space intervals
+which centers ‘n’ copies of frame ‘f’ within uniformly space intervals
in arclength along the path, optionally rotated by the angle of the
local tangent.
- The 'marker' (*note marker::) routine can be used to construct new
+ The ‘marker’ (*note marker::) routine can be used to construct new
markers from these predefined frames:
frame stickframe(int n=1, real size=0, pair space=0, real angle=0,
@@ -5266,9 +5313,9 @@ frame tildeframe(int n=1, real size=0, pair space=0,
real angle=0, pair offset=0, pen p=currentpen);
For convenience, this module also constructs the markers
-'StickIntervalMarker', 'CrossIntervalMarker', 'CircleBarIntervalMarker',
-and 'TildeIntervalMarker' from the above frames. The example
-'markers1.asy' illustrates the use of these markers:
+‘StickIntervalMarker’, ‘CrossIntervalMarker’, ‘CircleBarIntervalMarker’,
+and ‘TildeIntervalMarker’ from the above frames. The example
+‘markers1.asy’ illustrates the use of these markers:
[./markers1]
@@ -5279,7 +5326,7 @@ void markangle(picture pic=currentpicture, Label L="",
pair A, pair O, pair B, arrowbar arrow=None,
pen p=currentpen, margin margin=NoMargin,
marker marker=nomarker);
-as illustrated in the example 'markers2.asy'.
+as illustrated in the example ‘markers2.asy’.
[./markers2]
@@ -5287,11 +5334,11 @@ as illustrated in the example 'markers2.asy'.

File: asymptote.info, Node: map, Next: tree, Prev: markers, Up: Base modules
-8.10 'map'
+8.10 ‘map’
==========
This module creates a struct parameterized by the types specified in
-strings 'key' and 'value', mapping keys to values with a specified
+strings ‘key’ and ‘value’, mapping keys to values with a specified
default:
import map;
@@ -5308,7 +5355,7 @@ write(M.lookup("y"));

File: asymptote.info, Node: tree, Next: binarytree, Prev: map, Up: Base modules
-8.11 'tree'
+8.11 ‘tree’
===========
This module implements an example of a dynamic binary search tree.
@@ -5316,12 +5363,12 @@ This module implements an example of a dynamic binary search tree.

File: asymptote.info, Node: binarytree, Next: drawtree, Prev: tree, Up: Base modules
-8.12 'binarytree'
+8.12 ‘binarytree’
=================
This module can be used to draw an arbitrary binary tree and includes an
input routine for the special case of a binary search tree, as
-illustrated in the example 'binarytreetest.asy':
+illustrated in the example ‘binarytreetest.asy’:
import binarytree;
picture pic,pic2;
@@ -5341,134 +5388,134 @@ add(pic2.fit(),(0,0),10S);

File: asymptote.info, Node: drawtree, Next: syzygy, Prev: binarytree, Up: Base modules
-8.13 'drawtree'
+8.13 ‘drawtree’
===============
-This is a simple tree drawing module used by the example 'treetest.asy'.
+This is a simple tree drawing module used by the example ‘treetest.asy’.

File: asymptote.info, Node: syzygy, Next: feynman, Prev: drawtree, Up: Base modules
-8.14 'syzygy'
+8.14 ‘syzygy’
=============
This module automates the drawing of braids, relations, and syzygies,
along with the corresponding equations, as illustrated in the example
-'knots.asy'.
+‘knots.asy’.

File: asymptote.info, Node: feynman, Next: roundedpath, Prev: syzygy, Up: Base modules
-8.15 'feynman'
+8.15 ‘feynman’
==============
This module, contributed by Martin Wiebusch, is useful for drawing
-Feynman diagrams, as illustrated by the examples 'eetomumu.asy' and
-'fermi.asy'.
+Feynman diagrams, as illustrated by the examples ‘eetomumu.asy’ and
+‘fermi.asy’.

File: asymptote.info, Node: roundedpath, Next: animation, Prev: feynman, Up: Base modules
-8.16 'roundedpath'
+8.16 ‘roundedpath’
==================
This module, contributed by Stefan Knorr, is useful for rounding the
sharp corners of paths, as illustrated in the example file
-'roundpath.asy'.
+‘roundpath.asy’.

File: asymptote.info, Node: animation, Next: embed, Prev: roundedpath, Up: Base modules
-8.17 'animation'
+8.17 ‘animation’
================
This module allows one to generate animations, as illustrated by the
-files 'wheel.asy', 'wavepacket.asy', and 'cube.asy' in the 'animations'
+files ‘wheel.asy’, ‘wavepacket.asy’, and ‘cube.asy’ in the ‘animations’
subdirectory of the examples directory. These animations use the
-'ImageMagick' 'convert' program to merge multiple images into a GIF or
+‘ImageMagick’ ‘convert’ program to merge multiple images into a GIF or
MPEG movie.
- The related 'animate' module, derived from the 'animation' module,
+ The related ‘animate’ module, derived from the ‘animation’ module,
generates higher-quality portable clickable PDF movies, with optional
controls. This requires installing the module
<http://mirror.ctan.org/macros/latex/contrib/animate/animate.sty>
-(version 2007/11/30 or later) in a new directory 'animate' in the local
-'LaTeX' directory (for example, in
-'/usr/local/share/texmf/tex/latex/animate'). On 'UNIX' systems, one
-must then execute the command 'texhash'.
-
- The example 'pdfmovie.asy' in the 'animations' directory, along with
-the slide presentations 'slidemovies.asy' and 'intro', illustrate the
-use of embedded PDF movies. The examples 'inlinemovie.tex' and
-'inlinemovie3.tex' show how to generate and embed PDF movies directly
-within a 'LaTeX' file (*note LaTeX usage::). The member function
+(version 2007/11/30 or later) in a new directory ‘animate’ in the local
+‘LaTeX’ directory (for example, in
+‘/usr/local/share/texmf/tex/latex/animate’). On ‘UNIX’ systems, one
+must then execute the command ‘texhash’.
+
+ The example ‘pdfmovie.asy’ in the ‘animations’ directory, along with
+the slide presentations ‘slidemovies.asy’ and ‘intro’, illustrate the
+use of embedded PDF movies. The examples ‘inlinemovie.tex’ and
+‘inlinemovie3.tex’ show how to generate and embed PDF movies directly
+within a ‘LaTeX’ file (*note LaTeX usage::). The member function
string pdf(fit fit=NoBox, real delay=animationdelay, string options="",
bool keep=settings.keep, bool multipage=true);
-of the 'animate' structure accepts any of the 'animate.sty' options, as
+of the ‘animate’ structure accepts any of the ‘animate.sty’ options, as
described here:
<http://mirror.ctan.org/macros/latex/contrib/animate/doc/animate.pdf>

File: asymptote.info, Node: embed, Next: slide, Prev: animation, Up: Base modules
-8.18 'embed'
+8.18 ‘embed’
============
-This module provides an interface to the 'LaTeX' package (included with
-'MikTeX')
+This module provides an interface to the ‘LaTeX’ package (included with
+‘MikTeX’)
<http://mirror.ctan.org/macros/latex/contrib/media9>
for embedding movies, sounds, and 3D objects into a PDF document.
A more portable method for embedding movie files, which should work
-on any platform and does not require the 'media9' package, is provided
-by using the 'external' module instead of 'embed'.
+on any platform and does not require the ‘media9’ package, is provided
+by using the ‘external’ module instead of ‘embed’.
Examples of the above two interfaces is provided in the file
-'embeddedmovie.asy' in the 'animations' subdirectory of the examples
-directory and in 'externalmovie.asy'. For a higher quality embedded
-movie generated directly by 'Asymptote', use the 'animate' module along
-with the 'animate.sty' package to embed a portable PDF animation (*note
+‘embeddedmovie.asy’ in the ‘animations’ subdirectory of the examples
+directory and in ‘externalmovie.asy’. For a higher quality embedded
+movie generated directly by ‘Asymptote’, use the ‘animate’ module along
+with the ‘animate.sty’ package to embed a portable PDF animation (*note
animate::).
- An example of embedding 'U3D' code is provided in the file
-'embeddedu3d'.
+ An example of embedding ‘U3D’ code is provided in the file
+‘embeddedu3d’.

File: asymptote.info, Node: slide, Next: MetaPost, Prev: embed, Up: Base modules
-8.19 'slide'
+8.19 ‘slide’
============
This module provides a simple yet high-quality facility for making
presentation slides, including portable embedded PDF animations (see the
-file 'slidemovies.asy'). A simple example is provided in
-'slidedemo.asy'.
+file ‘slidemovies.asy’). A simple example is provided in
+‘slidedemo.asy’.

File: asymptote.info, Node: MetaPost, Next: babel, Prev: slide, Up: Base modules
-8.20 'MetaPost'
+8.20 ‘MetaPost’
===============
-This module provides some useful routines to help 'MetaPost' users
-migrate old 'MetaPost' code to 'Asymptote'. Further contributions here
+This module provides some useful routines to help ‘MetaPost’ users
+migrate old ‘MetaPost’ code to ‘Asymptote’. Further contributions here
are welcome.
- Unlike 'MetaPost', 'Asymptote' does not implicitly solve linear
-equations and therefore does not have the notion of a 'whatever'
-unknown. The routine 'extension' (*note extension::) provides a useful
-replacement for a common use of 'whatever': finding the intersection
-point of the lines through 'P', 'Q' and 'p', 'q'. For less common
-occurrences of 'whatever', one can use the built-in explicit linear
-equation solver 'solve' instead.
+ Unlike ‘MetaPost’, ‘Asymptote’ does not implicitly solve linear
+equations and therefore does not have the notion of a ‘whatever’
+unknown. The routine ‘extension’ (*note extension::) provides a useful
+replacement for a common use of ‘whatever’: finding the intersection
+point of the lines through ‘P’, ‘Q’ and ‘p’, ‘q’. For less common
+occurrences of ‘whatever’, one can use the built-in explicit linear
+equation solver ‘solve’ instead.

File: asymptote.info, Node: babel, Next: labelpath, Prev: MetaPost, Up: Base modules
-8.21 'babel'
+8.21 ‘babel’
============
-This module implements the 'LaTeX' 'babel' package in 'Asymptote'. For
+This module implements the ‘LaTeX’ ‘babel’ package in ‘Asymptote’. For
example:
import babel;
babel("german");
@@ -5476,155 +5523,156 @@ babel("german");

File: asymptote.info, Node: labelpath, Next: labelpath3, Prev: babel, Up: Base modules
-8.22 'labelpath'
+8.22 ‘labelpath’
================
-This module uses the 'PSTricks' 'pstextpath' macro to fit labels along a
+This module uses the ‘PSTricks’ ‘pstextpath’ macro to fit labels along a
path (properly kerned, as illustrated in the example file
-'curvedlabel.asy'), using the command
+‘curvedlabel.asy’), using the command
void labelpath(picture pic=currentpicture, Label L, path g,
string justify=Centered, pen p=currentpen);
-Here 'justify' is one of 'LeftJustified', 'Centered', or
-'RightJustified'. The x component of a shift transform applied to the
+Here ‘justify’ is one of ‘LeftJustified’, ‘Centered’, or
+‘RightJustified’. The x component of a shift transform applied to the
Label is interpreted as a shift along the curve, whereas the y component
is interpreted as a shift away from the curve. All other Label
-transforms are ignored. This module requires the 'latex' tex engine and
-inherits the limitations of the 'PSTricks' '\pstextpath' macro.
+transforms are ignored. This module requires the ‘latex’ tex engine and
+inherits the limitations of the ‘PSTricks’ ‘\pstextpath’ macro.

File: asymptote.info, Node: labelpath3, Next: annotate, Prev: labelpath, Up: Base modules
-8.23 'labelpath3'
+8.23 ‘labelpath3’
=================
This module, contributed by Jens Schwaiger, implements a 3D version of
-'labelpath' that does not require the 'PSTricks' package. An example is
-provided in 'curvedlabel3.asy'.
+‘labelpath’ that does not require the ‘PSTricks’ package. An example is
+provided in ‘curvedlabel3.asy’.

File: asymptote.info, Node: annotate, Next: CAD, Prev: labelpath3, Up: Base modules
-8.24 'annotate'
+8.24 ‘annotate’
===============
-This module supports PDF annotations for viewing with 'Adobe Reader',
+This module supports PDF annotations for viewing with ‘Adobe Reader’,
via the function
void annotate(picture pic=currentpicture, string title, string text,
pair position);
-Annotations are illustrated in the example file 'annotation.asy'.
-Currently, annotations are only implemented for the 'latex' (default)
-and 'tex' TeX engines.
+Annotations are illustrated in the example file ‘annotation.asy’.
+Currently, annotations are only implemented for the ‘latex’ (default)
+and ‘tex’ TeX engines.

File: asymptote.info, Node: CAD, Next: graph, Prev: annotate, Up: Base modules
-8.25 'CAD'
+8.25 ‘CAD’
==========
This module, contributed by Mark Henning, provides basic pen definitions
and measurement functions for simple 2D CAD drawings according to DIN
-15. It is documented separately, in the file 'CAD.pdf'.
+15. It is documented separately, in the file ‘CAD.pdf’.

File: asymptote.info, Node: graph, Next: palette, Prev: CAD, Up: Base modules
-8.26 'graph'
+8.26 ‘graph’
============
This module implements two-dimensional linear and logarithmic graphs,
including automatic scale and tick selection (with the ability to
-override manually). A graph is a 'guide' (that can be drawn with the
+override manually). A graph is a ‘guide’ (that can be drawn with the
draw command, with an optional legend) constructed with one of the
following routines:
- * guide graph(picture pic=currentpicture, real f(real), real a, real b,
+ • guide graph(picture pic=currentpicture, real f(real), real a, real b,
int n=ngraph, real T(real)=identity,
interpolate join=operator --);
guide[] graph(picture pic=currentpicture, real f(real), real a, real b,
int n=ngraph, real T(real)=identity, bool3 cond(real),
interpolate join=operator --);
- Returns a graph using the scaling information for picture 'pic'
- (*note automatic scaling::) of the function 'f' on the interval
- ['T'('a'),'T'('b')], sampling at 'n' points evenly spaced in
- ['a','b'], optionally restricted by the bool3 function 'cond' on
- ['a','b']. If 'cond' is:
- * 'true', the point is added to the existing guide;
- * 'default', the point is added to a new guide;
- * 'false', the point is omitted and a new guide is begun.
+ Returns a graph using the scaling information for picture ‘pic’
+ (*note automatic scaling::) of the function ‘f’ on the interval
+ [‘T’(‘a’),‘T’(‘b’)], sampling at ‘n’ points evenly spaced in
+ [‘a’,‘b’], optionally restricted by the bool3 function ‘cond’ on
+ [‘a’,‘b’]. If ‘cond’ is:
+ • ‘true’, the point is added to the existing guide;
+ • ‘default’, the point is added to a new guide;
+ • ‘false’, the point is omitted and a new guide is begun.
The points are connected using the interpolation specified by
- 'join':
+ ‘join’:
- * 'operator --' (linear interpolation; the abbreviation
- 'Straight' is also accepted);
+ • ‘operator --’ (linear interpolation; the abbreviation
+ ‘Straight’ is also accepted);
- * 'operator ..' (piecewise Bezier cubic spline interpolation;
- the abbreviation 'Spline' is also accepted);
+ • ‘operator ..’ (piecewise Bezier cubic spline interpolation;
+ the abbreviation ‘Spline’ is also accepted);
- * 'Hermite' (standard cubic spline interpolation using boundary
- condition 'notaknot', 'natural', 'periodic', 'clamped(real
- slopea, real slopeb)'), or 'monotonic'. The abbreviation
- 'Hermite' is equivalent to 'Hermite(notaknot)' for nonperiodic
- data and 'Hermite(periodic)' for periodic data).
+ • ‘linear’ (linear interpolation),
+ • ‘Hermite’ (standard cubic spline interpolation using boundary
+ condition ‘notaknot’, ‘natural’, ‘periodic’, ‘clamped(real
+ slopea, real slopeb)’), or ‘monotonic’. The abbreviation
+ ‘Hermite’ is equivalent to ‘Hermite(notaknot)’ for nonperiodic
+ data and ‘Hermite(periodic)’ for periodic data).
- * guide graph(picture pic=currentpicture, real x(real), real y(real),
+ • guide graph(picture pic=currentpicture, real x(real), real y(real),
real a, real b, int n=ngraph, real T(real)=identity,
interpolate join=operator --);
guide[] graph(picture pic=currentpicture, real x(real), real y(real),
real a, real b, int n=ngraph, real T(real)=identity,
bool3 cond(real), interpolate join=operator --);
- Returns a graph using the scaling information for picture 'pic' of
- the parametrized function ('x'(t),'y'(t)) for t in the interval
- ['T'('a'),'T'('b')], sampling at 'n' points evenly spaced in
- ['a','b'], optionally restricted by the bool3 function 'cond' on
- ['a','b'], using the given interpolation type.
+ Returns a graph using the scaling information for picture ‘pic’ of
+ the parametrized function (‘x’(t),‘y’(t)) for t in the interval
+ [‘T’(‘a’),‘T’(‘b’)], sampling at ‘n’ points evenly spaced in
+ [‘a’,‘b’], optionally restricted by the bool3 function ‘cond’ on
+ [‘a’,‘b’], using the given interpolation type.
- * guide graph(picture pic=currentpicture, pair z(real), real a, real b,
+ • guide graph(picture pic=currentpicture, pair z(real), real a, real b,
int n=ngraph, real T(real)=identity,
interpolate join=operator --);
guide[] graph(picture pic=currentpicture, pair z(real), real a, real b,
int n=ngraph, real T(real)=identity, bool3 cond(real),
interpolate join=operator --);
- Returns a graph using the scaling information for picture 'pic' of
- the parametrized function 'z'(t) for t in the interval
- ['T'('a'),'T'('b')], sampling at 'n' points evenly spaced in
- ['a','b'], optionally restricted by the bool3 function 'cond' on
- ['a','b'], using the given interpolation type.
+ Returns a graph using the scaling information for picture ‘pic’ of
+ the parametrized function ‘z’(t) for t in the interval
+ [‘T’(‘a’),‘T’(‘b’)], sampling at ‘n’ points evenly spaced in
+ [‘a’,‘b’], optionally restricted by the bool3 function ‘cond’ on
+ [‘a’,‘b’], using the given interpolation type.
- * guide graph(picture pic=currentpicture, pair[] z,
+ • guide graph(picture pic=currentpicture, pair[] z,
interpolate join=operator --);
guide[] graph(picture pic=currentpicture, pair[] z, bool3[] cond,
interpolate join=operator --);
- Returns a graph using the scaling information for picture 'pic' of
- the elements of the array 'z', optionally restricted to those
- indices for which the elements of the boolean array 'cond' are
- 'true', using the given interpolation type.
+ Returns a graph using the scaling information for picture ‘pic’ of
+ the elements of the array ‘z’, optionally restricted to those
+ indices for which the elements of the boolean array ‘cond’ are
+ ‘true’, using the given interpolation type.
- * guide graph(picture pic=currentpicture, real[] x, real[] y,
+ • guide graph(picture pic=currentpicture, real[] x, real[] y,
interpolate join=operator --);
guide[] graph(picture pic=currentpicture, real[] x, real[] y,
bool3[] cond, interpolate join=operator --);
- Returns a graph using the scaling information for picture 'pic' of
- the elements of the arrays ('x','y'), optionally restricted to
- those indices for which the elements of the boolean array 'cond'
- are 'true', using the given interpolation type.
+ Returns a graph using the scaling information for picture ‘pic’ of
+ the elements of the arrays (‘x’,‘y’), optionally restricted to
+ those indices for which the elements of the boolean array ‘cond’
+ are ‘true’, using the given interpolation type.
- * guide polargraph(picture pic=currentpicture, real f(real), real a,
+ • guide polargraph(picture pic=currentpicture, real f(real), real a,
real b, int n=ngraph, interpolate join=operator --);
Returns a polar-coordinate graph using the scaling information for
- picture 'pic' of the function 'f' on the interval ['a','b'],
- sampling at 'n' evenly spaced points, with the given interpolation
+ picture ‘pic’ of the function ‘f’ on the interval [‘a’,‘b’],
+ sampling at ‘n’ evenly spaced points, with the given interpolation
type.
- * guide polargraph(picture pic=currentpicture, real[] r, real[] theta,
+ • guide polargraph(picture pic=currentpicture, real[] r, real[] theta,
interpolate join=operator--);
Returns a polar-coordinate graph using the scaling information for
- picture 'pic' of the elements of the arrays ('r','theta'), using
+ picture ‘pic’ of the elements of the arrays (‘r’,‘theta’), using
the given interpolation type.
@@ -5632,42 +5680,42 @@ following routines:
An axis can be drawn on a picture with one of the following commands:
- * void xaxis(picture pic=currentpicture, Label L="", axis axis=YZero,
+ • void xaxis(picture pic=currentpicture, Label L="", axis axis=YZero,
real xmin=-infinity, real xmax=infinity, pen p=currentpen,
ticks ticks=NoTicks, arrowbar arrow=None, bool above=false);
- Draw an x axis on picture 'pic' from x='xmin' to x='xmax' using pen
- 'p', optionally labelling it with Label 'L'. The relative label
+ Draw an x axis on picture ‘pic’ from x=‘xmin’ to x=‘xmax’ using pen
+ ‘p’, optionally labelling it with Label ‘L’. The relative label
location along the axis (a real number from [0,1]) defaults to 1
(*note Label::), so that the label is drawn at the end of the axis.
- An infinite value of 'xmin' or 'xmax' specifies that the
+ An infinite value of ‘xmin’ or ‘xmax’ specifies that the
corresponding axis limit will be automatically determined from the
- picture limits. The optional 'arrow' argument takes the same
- values as in the 'draw' command (*note arrows::). The axis is
- drawn before any existing objects in 'pic' unless 'above=true'.
- The axis placement is determined by one of the following 'axis'
+ picture limits. The optional ‘arrow’ argument takes the same
+ values as in the ‘draw’ command (*note arrows::). The axis is
+ drawn before any existing objects in ‘pic’ unless ‘above=true’.
+ The axis placement is determined by one of the following ‘axis’
types:
- 'YZero(bool extend=true)'
+ ‘YZero(bool extend=true)’
Request an x axis at y=0 (or y=1 on a logarithmic axis)
extending to the full dimensions of the picture, unless
- 'extend'=false.
+ ‘extend’=false.
- 'YEquals(real Y, bool extend=true)'
- Request an x axis at y='Y' extending to the full dimensions of
- the picture, unless 'extend'=false.
+ ‘YEquals(real Y, bool extend=true)’
+ Request an x axis at y=‘Y’ extending to the full dimensions of
+ the picture, unless ‘extend’=false.
- 'Bottom(bool extend=false)'
+ ‘Bottom(bool extend=false)’
Request a bottom axis.
- 'Top(bool extend=false)'
+ ‘Top(bool extend=false)’
Request a top axis.
- 'BottomTop(bool extend=false)'
+ ‘BottomTop(bool extend=false)’
Request a bottom and top axis.
Custom axis types can be created by following the examples in the
- module 'graph.asy'. One can easily override the default values for
+ module ‘graph.asy’. One can easily override the default values for
the standard axis types:
import graph;
@@ -5685,8 +5733,8 @@ following routines:
YZero=YZero();
- The default tick option is 'NoTicks'. The options 'LeftTicks',
- 'RightTicks', or 'Ticks' can be used to draw ticks on the left,
+ The default tick option is ‘NoTicks’. The options ‘LeftTicks’,
+ ‘RightTicks’, or ‘Ticks’ can be used to draw ticks on the left,
right, or both sides of the path, relative to the direction in
which the path is drawn. These tick routines accept a number of
optional arguments:
@@ -5699,68 +5747,68 @@ following routines:
If any of these parameters are omitted, reasonable defaults will be
chosen:
- 'Label format'
- override the default tick label format ('defaultformat',
+ ‘Label format’
+ override the default tick label format (‘defaultformat’,
initially "$%.4g$"), rotation, pen, and alignment (for
- example, 'LeftSide', 'Center', or 'RightSide') relative to the
- axis. To enable 'LaTeX' math mode fonts, the format string
- should begin and end with '$' *note format::. If the format
- string is 'trailingzero', trailing zeros will be added to the
- tick labels; if the format string is '"%"', the tick label
+ example, ‘LeftSide’, ‘Center’, or ‘RightSide’) relative to the
+ axis. To enable ‘LaTeX’ math mode fonts, the format string
+ should begin and end with ‘$’ *note format::. If the format
+ string is ‘trailingzero’, trailing zeros will be added to the
+ tick labels; if the format string is ‘"%"’, the tick label
will be suppressed;
- 'ticklabel'
- is a function 'string(real x)' returning the label (by
- default, format(format.s,x)) for each major tick value 'x';
- 'bool beginlabel'
+ ‘ticklabel’
+ is a function ‘string(real x)’ returning the label (by
+ default, format(format.s,x)) for each major tick value ‘x’;
+ ‘bool beginlabel’
include the first label;
- 'bool endlabel'
+ ‘bool endlabel’
include the last label;
- 'int N'
+ ‘int N’
when automatic scaling is enabled (the default; *note
automatic scaling::), divide a linear axis evenly into this
many intervals, separated by major ticks; for a logarithmic
axis, this is the number of decades between labelled ticks;
- 'int n'
+ ‘int n’
divide each interval into this many subintervals, separated by
minor ticks;
- 'real Step'
- the tick value spacing between major ticks (if 'N'='0');
- 'real step'
- the tick value spacing between minor ticks (if 'n'='0');
- 'bool begin'
+ ‘real Step’
+ the tick value spacing between major ticks (if ‘N’=‘0’);
+ ‘real step’
+ the tick value spacing between minor ticks (if ‘n’=‘0’);
+ ‘bool begin’
include the first major tick;
- 'bool end'
+ ‘bool end’
include the last major tick;
- 'tickmodifier modify;'
- an optional function that takes and returns a 'tickvalue'
- structure having real[] members 'major' and 'minor' consisting
+ ‘tickmodifier modify;’
+ an optional function that takes and returns a ‘tickvalue’
+ structure having real[] members ‘major’ and ‘minor’ consisting
of the tick values (to allow modification of the automatically
generated tick values);
- 'real Size'
- the size of the major ticks (in 'PostScript' coordinates);
- 'real size'
- the size of the minor ticks (in 'PostScript' coordinates);
- 'bool extend;'
+ ‘real Size’
+ the size of the major ticks (in ‘PostScript’ coordinates);
+ ‘real size’
+ the size of the minor ticks (in ‘PostScript’ coordinates);
+ ‘bool extend;’
extend the ticks between two axes (useful for drawing a grid
on the graph);
- 'pen pTick'
+ ‘pen pTick’
an optional pen used to draw the major ticks;
- 'pen ptick'
+ ‘pen ptick’
an optional pen used to draw the minor ticks.
- For convenience, the predefined tickmodifiers 'OmitTick(... real[]
- x)', 'OmitTickInterval(real a, real b)', and
- 'OmitTickIntervals(real[] a, real[] b)' can be used to remove
+ For convenience, the predefined tickmodifiers ‘OmitTick(... real[]
+ x)’, ‘OmitTickInterval(real a, real b)’, and
+ ‘OmitTickIntervals(real[] a, real[] b)’ can be used to remove
specific auto-generated ticks and their labels. The
- 'OmitFormat(string s=defaultformat ... real[] x)' ticklabel can be
+ ‘OmitFormat(string s=defaultformat ... real[] x)’ ticklabel can be
used to remove specific tick labels but not the corresponding
- ticks. The tickmodifier 'NoZero' is an abbreviation for
- 'OmitTick(0)' and the ticklabel 'NoZeroFormat' is an abbrevation
- for 'OmitFormat(0)'.
+ ticks. The tickmodifier ‘NoZero’ is an abbreviation for
+ ‘OmitTick(0)’ and the ticklabel ‘NoZeroFormat’ is an abbrevation
+ for ‘OmitFormat(0)’.
It is also possible to specify custom tick locations with
- 'LeftTicks', 'RightTicks', and 'Ticks' by passing explicit real
- arrays 'Ticks' and (optionally) 'ticks' containing the locations of
+ ‘LeftTicks’, ‘RightTicks’, and ‘Ticks’ by passing explicit real
+ arrays ‘Ticks’ and (optionally) ‘ticks’ containing the locations of
the major and minor ticks, respectively:
ticks LeftTicks(Label format="", ticklabel ticklabel=null,
bool beginlabel=true, bool endlabel=true,
@@ -5768,42 +5816,42 @@ following routines:
real Size=0, real size=0, bool extend=false,
pen pTick=nullpen, pen ptick=nullpen)
- * void yaxis(picture pic=currentpicture, Label L="", axis axis=XZero,
+ • void yaxis(picture pic=currentpicture, Label L="", axis axis=XZero,
real ymin=-infinity, real ymax=infinity, pen p=currentpen,
ticks ticks=NoTicks, arrowbar arrow=None, bool above=false,
bool autorotate=true);
- Draw a y axis on picture 'pic' from y='ymin' to y='ymax' using pen
- 'p', optionally labelling it with a Label 'L' that is autorotated
- unless 'autorotate=false'. The relative location of the label (a
+ Draw a y axis on picture ‘pic’ from y=‘ymin’ to y=‘ymax’ using pen
+ ‘p’, optionally labelling it with a Label ‘L’ that is autorotated
+ unless ‘autorotate=false’. The relative location of the label (a
real number from [0,1]) defaults to 1 (*note Label::). An infinite
- value of 'ymin' or 'ymax' specifies that the corresponding axis
+ value of ‘ymin’ or ‘ymax’ specifies that the corresponding axis
limit will be automatically determined from the picture limits.
- The optional 'arrow' argument takes the same values as in the
- 'draw' command (*note arrows::). The axis is drawn before any
- existing objects in 'pic' unless 'above=true'. The tick type is
- specified by 'ticks' and the axis placement is determined by one of
- the following 'axis' types:
+ The optional ‘arrow’ argument takes the same values as in the
+ ‘draw’ command (*note arrows::). The axis is drawn before any
+ existing objects in ‘pic’ unless ‘above=true’. The tick type is
+ specified by ‘ticks’ and the axis placement is determined by one of
+ the following ‘axis’ types:
- 'XZero(bool extend=true)'
+ ‘XZero(bool extend=true)’
Request a y axis at x=0 (or x=1 on a logarithmic axis)
extending to the full dimensions of the picture, unless
- 'extend'=false.
+ ‘extend’=false.
- 'XEquals(real X, bool extend=true)'
- Request a y axis at x='X' extending to the full dimensions of
- the picture, unless 'extend'=false.
+ ‘XEquals(real X, bool extend=true)’
+ Request a y axis at x=‘X’ extending to the full dimensions of
+ the picture, unless ‘extend’=false.
- 'Left(bool extend=false)'
+ ‘Left(bool extend=false)’
Request a left axis.
- 'Right(bool extend=false)'
+ ‘Right(bool extend=false)’
Request a right axis.
- 'LeftRight(bool extend=false)'
+ ‘LeftRight(bool extend=false)’
Request a left and right axis.
- * For convenience, the functions
+ • For convenience, the functions
void xequals(picture pic=currentpicture, Label L="", real x,
bool extend=false, real ymin=-infinity, real ymax=infinity,
pen p=currentpen, ticks ticks=NoTicks, bool above=true,
@@ -5813,48 +5861,48 @@ following routines:
bool extend=false, real xmin=-infinity, real xmax=infinity,
pen p=currentpen, ticks ticks=NoTicks, bool above=true,
arrowbar arrow=None);
- can be respectively used to call 'yaxis' and 'xaxis' with the
- appropriate axis types 'XEquals(x,extend)' and 'YEquals(y,extend)'.
+ can be respectively used to call ‘yaxis’ and ‘xaxis’ with the
+ appropriate axis types ‘XEquals(x,extend)’ and ‘YEquals(y,extend)’.
This is the recommended way of drawing vertical or horizontal lines
and axes at arbitrary locations.
- * void axes(picture pic=currentpicture, Label xlabel="", Label ylabel="",
+ • void axes(picture pic=currentpicture, Label xlabel="", Label ylabel="",
bool extend=true,
pair min=(-infinity,-infinity), pair max=(infinity,infinity),
pen p=currentpen, arrowbar arrow=None, bool above=false);
- This convenience routine draws both x and y axes on picture 'pic'
- from 'min' to 'max', with optional labels 'xlabel' and 'ylabel' and
- any arrows specified by 'arrow'. The axes are drawn on top of
- existing objects in 'pic' only if 'above=true'.
+ This convenience routine draws both x and y axes on picture ‘pic’
+ from ‘min’ to ‘max’, with optional labels ‘xlabel’ and ‘ylabel’ and
+ any arrows specified by ‘arrow’. The axes are drawn on top of
+ existing objects in ‘pic’ only if ‘above=true’.
- * void axis(picture pic=currentpicture, Label L="", path g,
+ • void axis(picture pic=currentpicture, Label L="", path g,
pen p=currentpen, ticks ticks, ticklocate locate,
arrowbar arrow=None, int[] divisor=new int[],
bool above=false, bool opposite=false);
- This routine can be used to draw on picture 'pic' a general axis
- based on an arbitrary path 'g', using pen 'p'. One can optionally
- label the axis with Label 'L' and add an arrow 'arrow'. The tick
- type is given by 'ticks'. The optional integer array 'divisor'
+ This routine can be used to draw on picture ‘pic’ a general axis
+ based on an arbitrary path ‘g’, using pen ‘p’. One can optionally
+ label the axis with Label ‘L’ and add an arrow ‘arrow’. The tick
+ type is given by ‘ticks’. The optional integer array ‘divisor’
specifies what tick divisors to try in the attempt to produce
- uncrowded tick labels. A 'true' value for the flag 'opposite'
+ uncrowded tick labels. A ‘true’ value for the flag ‘opposite’
identifies an unlabelled secondary axis (typically drawn opposite a
primary axis). The axis is drawn before any existing objects in
- 'pic' unless 'above=true'. The tick locator 'ticklocate' is
+ ‘pic’ unless ‘above=true’. The tick locator ‘ticklocate’ is
constructed by the routine
ticklocate ticklocate(real a, real b, autoscaleT S=defaultS,
real tickmin=-infinity, real tickmax=infinity,
real time(real)=null, pair dir(real)=zero);
- where 'a' and 'b' specify the respective tick values at
- 'point(g,0)' and 'point(g,length(g))', 'S' specifies the
- autoscaling transformation, the function 'real time(real v)'
- returns the time corresponding to the value 'v', and 'pair dir(real
- t)' returns the absolute tick direction as a function of 't' (zero
+ where ‘a’ and ‘b’ specify the respective tick values at
+ ‘point(g,0)’ and ‘point(g,length(g))’, ‘S’ specifies the
+ autoscaling transformation, the function ‘real time(real v)’
+ returns the time corresponding to the value ‘v’, and ‘pair dir(real
+ t)’ returns the absolute tick direction as a function of ‘t’ (zero
means draw the tick perpendicular to the axis).
- * These routines are useful for manually putting ticks and labels on
- axes (if the variable 'Label' is given as the 'Label' argument, the
- 'format' argument will be used to format a string based on the tick
+ • These routines are useful for manually putting ticks and labels on
+ axes (if the variable ‘Label’ is given as the ‘Label’ argument, the
+ ‘format’ argument will be used to format a string based on the tick
location):
void xtick(picture pic=currentpicture, Label L="", explicit pair z,
pair dir=N, string format="",
@@ -5907,8 +5955,8 @@ following routines:
2. The next example draws a scientific-style graph with a legend. The
position of the legend can be adjusted either explicitly or by
using the graphical user interface (*note GUI::). If an
- 'UnFill(real xmargin=0, real ymargin=xmargin)' or 'Fill(pen)'
- option is specified to 'add', the legend will obscure any
+ ‘UnFill(real xmargin=0, real ymargin=xmargin)’ or ‘Fill(pen)’
+ option is specified to ‘add’, the legend will obscure any
underlying objects. Here we illustrate how to clip the portion of
the picture covered by a label:
@@ -5931,7 +5979,7 @@ following routines:
[./lineargraph0]
- To specify a fixed size for the graph proper, use 'attach':
+ To specify a fixed size for the graph proper, use ‘attach’:
import graph;
size(250,200,IgnoreAspect);
@@ -6011,23 +6059,23 @@ following routines:
marker marker(path g, markroutine markroutine=marknodes,
pen p=currentpen, filltype filltype=NoFill,
bool above=true);
- using the path 'unitcircle' (*note filltype::), are drawn below
+ using the path ‘unitcircle’ (*note filltype::), are drawn below
each node. Any frame can be converted to a marker, using
marker marker(frame f, markroutine markroutine=marknodes,
bool above=true);
In the right-hand graph, the unit n-sided regular polygon
- 'polygon(int n)' and the unit n-point cyclic cross 'cross(int n,
- bool round=true, real r=0)' (where 'r' is an optional "inner"
+ ‘polygon(int n)’ and the unit n-point cyclic cross ‘cross(int n,
+ bool round=true, real r=0)’ (where ‘r’ is an optional “inner”
radius) are used to build a custom marker frame. Here
- 'markuniform(bool centered=false, int n, bool rotated=false)' adds
- this frame at 'n' uniformly spaced points along the arclength of
+ ‘markuniform(bool centered=false, int n, bool rotated=false)’ adds
+ this frame at ‘n’ uniformly spaced points along the arclength of
the path, optionally rotated by the angle of the local tangent to
the path (if centered is true, the frames will be centered within
- 'n' evenly spaced arclength intervals). Alternatively, one can use
- markroutine 'marknodes' to request that the marks be placed at each
- Bezier node of the path, or markroutine 'markuniform(pair z(real
- t), real a, real b, int n)' to place marks at points 'z(t)' for n
- evenly spaced values of 't' in '[a,b]'.
+ ‘n’ evenly spaced arclength intervals). Alternatively, one can use
+ markroutine ‘marknodes’ to request that the marks be placed at each
+ Bezier node of the path, or markroutine ‘markuniform(pair z(real
+ t), real a, real b, int n)’ to place marks at points ‘z(t)’ for n
+ evenly spaced values of ‘t’ in ‘[a,b]’.
These markers are predefined:
marker[] Mark={
@@ -6043,7 +6091,7 @@ following routines:
marker(invert*polygon(3),Fill),marker(diamond,Fill)
};
- The example also illustrates the 'errorbar' routines:
+ The example also illustrates the ‘errorbar’ routines:
void errorbars(picture pic=currentpicture, pair[] z, pair[] dp,
pair[] dm={}, bool[] cond={}, pen p=currentpen,
@@ -6054,8 +6102,8 @@ following routines:
bool[] cond={}, pen p=currentpen, real size=0);
Here, the positive and negative extents of the error are given by
- the absolute values of the elements of the pair array 'dp' and the
- optional pair array 'dm'. If 'dm' is not specified, the positive
+ the absolute values of the elements of the pair array ‘dp’ and the
+ optional pair array ‘dm’. If ‘dm’ is not specified, the positive
and negative extents of the error are assumed to be equal.
import graph;
@@ -6168,14 +6216,14 @@ following routines:
to
xlimits(picture pic=currentpicture, real min=-infinity,
real max=infinity, bool crop=NoCrop);
- and the analogous function 'ylimits' can be uncommented to set the
- respective axes limits for picture 'pic' to the specified 'min' and
- 'max' values. Alternatively, the function
+ and the analogous function ‘ylimits’ can be uncommented to set the
+ respective axes limits for picture ‘pic’ to the specified ‘min’ and
+ ‘max’ values. Alternatively, the function
void limits(picture pic=currentpicture, pair min, pair max, bool crop=NoCrop);
can be used to limit the axes to the box having opposite vertices
- at the given pairs). Existing objects in picture 'pic' will be
- cropped to lie within the given limits if 'crop'='Crop'. The
- function 'crop(picture pic)' can be used to crop a graph to the
+ at the given pairs). Existing objects in picture ‘pic’ will be
+ cropped to lie within the given limits if ‘crop’=‘Crop’. The
+ function ‘crop(picture pic)’ can be used to crop a graph to the
current graph limits.
import graph;
@@ -6198,9 +6246,9 @@ following routines:
The function
guide graphwithderiv(pair f(real), pair fprime(real), real a, real b,
int n=ngraph#10);
- can be used to construct the graph of the parametric function 'f'
- on '[a,b]' with the control points of the 'n' Bezier segments
- determined by the specified derivative 'fprime':
+ can be used to construct the graph of the parametric function ‘f’
+ on ‘[a,b]’ with the control points of the ‘n’ Bezier segments
+ determined by the specified derivative ‘fprime’:
unitsize(2cm);
import graph;
pair F(real t) {
@@ -6236,22 +6284,22 @@ following routines:
[./scaledgraph]
Axis scaling can be requested and/or automatic selection of the
- axis limits can be inhibited with one of these 'scale' routines:
+ axis limits can be inhibited with one of these ‘scale’ routines:
void scale(picture pic=currentpicture, scaleT x, scaleT y);
void scale(picture pic=currentpicture, bool xautoscale=true,
bool yautoscale=xautoscale, bool zautoscale=yautoscale);
- This sets the scalings for picture 'pic'. The 'graph' routines
- accept an optional 'picture' argument for determining the
+ This sets the scalings for picture ‘pic’. The ‘graph’ routines
+ accept an optional ‘picture’ argument for determining the
appropriate scalings to use; if none is given, it uses those set
- for 'currentpicture'.
+ for ‘currentpicture’.
- Two frequently used scaling routines 'Linear' and 'Log' are
- predefined in 'graph'.
+ Two frequently used scaling routines ‘Linear’ and ‘Log’ are
+ predefined in ‘graph’.
All picture coordinates (including those in paths and those given
- to the 'label' and 'limits' functions) are always treated as linear
+ to the ‘label’ and ‘limits’ functions) are always treated as linear
(post-scaled) coordinates. Use
pair Scale(picture pic=currentpicture, pair z);
to convert a graph coordinate into a scaled picture coordinate.
@@ -6262,15 +6310,15 @@ following routines:
real ScaleY(picture pic=currentpicture, real y);
The predefined scaling routines can be given two optional boolean
- arguments: 'automin=false' and 'automax=automin'. These default to
- 'false' but can be respectively set to 'true' to enable automatic
- selection of "nice" axis minimum and maximum values. The 'Linear'
+ arguments: ‘automin=false’ and ‘automax=automin’. These default to
+ ‘false’ but can be respectively set to ‘true’ to enable automatic
+ selection of "nice" axis minimum and maximum values. The ‘Linear’
scaling can also take as optional final arguments a multiplicative
- scaling factor and intercept (e.g. for a depth axis, 'Linear(-1)'
+ scaling factor and intercept (e.g. for a depth axis, ‘Linear(-1)’
requests axis reversal).
For example, to draw a log/log graph of a function, use
- 'scale(Log,Log)':
+ ‘scale(Log,Log)’:
import graph;
size(200,200,IgnoreAspect);
@@ -6378,11 +6426,11 @@ following routines:
[./brokenaxis]
- 9. 'Asymptote' can draw secondary axes with the routines
+ 9. ‘Asymptote’ can draw secondary axes with the routines
picture secondaryX(picture primary=currentpicture, void f(picture));
picture secondaryY(picture primary=currentpicture, void f(picture));
- In this example, 'secondaryY' is used to draw a secondary linear y
+ In this example, ‘secondaryY’ is used to draw a secondary linear y
axis against a primary logarithmic y axis:
import graph;
texpreamble("\def\Arg{\mathop {\rm Arg}\nolimits}");
@@ -6449,7 +6497,7 @@ following routines:
[./secondaryaxis]
- 10. Here is a histogram example, which uses the 'stats' module.
+ 10. Here is a histogram example, which uses the ‘stats’ module.
import graph;
import stats;
@@ -6472,7 +6520,7 @@ following routines:
[./histogram]
11. Here is an example of reading column data in from a file and a
- least-squares fit, using the 'stats' module.
+ least-squares fit, using the ‘stats’ module.
size(400,200,IgnoreAspect);
import graph;
@@ -6531,7 +6579,7 @@ following routines:
[./leastsquares]
- 12. Here is an example that illustrates the general 'axis' routine.
+ 12. Here is an example that illustrates the general ‘axis’ routine.
import graph;
size(0,100);
@@ -6546,7 +6594,7 @@ following routines:
[./generalaxis]
- 13. To draw a vector field of 'n' arrows evenly spaced along the
+ 13. To draw a vector field of ‘n’ arrows evenly spaced along the
arclength of a path, use the routine
picture vectorfield(path vector(real), path g, int n, bool truesize=false,
pen p=currentpen, arrowbar arrow=Arrow);
@@ -6585,7 +6633,7 @@ following routines:
[./flow]
- 14. To draw a vector field of 'nx'\times'ny' arrows in 'box(a,b)', use
+ 14. To draw a vector field of ‘nx’\times‘ny’ arrows in ‘box(a,b)’, use
the routine
picture vectorfield(path vector(pair), pair a, pair b,
int nx=nmesh, int ny=nx, bool truesize=false,
@@ -6606,9 +6654,9 @@ following routines:
[./vectorfield]
15. The following scientific graphs, which illustrate many features of
- 'Asymptote''s graphics routines, were generated from the examples
- 'diatom.asy' and 'westnile.asy', using the comma-separated data in
- 'diatom.csv' and 'westnile.csv'.
+ ‘Asymptote’’s graphics routines, were generated from the examples
+ ‘diatom.asy’ and ‘westnile.asy’, using the comma-separated data in
+ ‘diatom.csv’ and ‘westnile.csv’.
[./diatom]
@@ -6618,46 +6666,46 @@ following routines:

File: asymptote.info, Node: palette, Next: three, Prev: graph, Up: Base modules
-8.27 'palette'
+8.27 ‘palette’
==============
-'Asymptote' can also generate color density images and palettes. The
-following palettes are predefined in 'palette.asy':
+‘Asymptote’ can also generate color density images and palettes. The
+following palettes are predefined in ‘palette.asy’:
-'pen[] Grayscale(int NColors=256)'
+‘pen[] Grayscale(int NColors=256)’
a grayscale palette;
-'pen[] Rainbow(int NColors=32766)'
+‘pen[] Rainbow(int NColors=32766)’
a rainbow spectrum;
-'pen[] BWRainbow(int NColors=32761)'
+‘pen[] BWRainbow(int NColors=32761)’
a rainbow spectrum tapering off to black/white at the ends;
-'pen[] BWRainbow2(int NColors=32761)'
+‘pen[] BWRainbow2(int NColors=32761)’
a double rainbow palette tapering off to black/white at the ends,
with a linearly scaled intensity.
-'pen[] Wheel(int NColors=32766)'
+‘pen[] Wheel(int NColors=32766)’
a full color wheel palette;
-'pen[] Gradient(int NColors=256 ... pen[] p)'
+‘pen[] Gradient(int NColors=256 ... pen[] p)’
a palette varying linearly over the specified array of pens, using
NColors in each interpolation interval;
- The function 'cmyk(pen[] Palette)' may be used to convert any of
+ The function ‘cmyk(pen[] Palette)’ may be used to convert any of
these palettes to the CMYK colorspace.
- A color density plot using palette 'palette' can be generated from a
-function 'f'(x,y) and added to a picture 'pic':
+ A color density plot using palette ‘palette’ can be generated from a
+function ‘f’(x,y) and added to a picture ‘pic’:
bounds image(picture pic=currentpicture, real f(real, real),
range range=Full, pair initial, pair final,
int nx=ngraph, int ny=nx, pen[] palette, int divs=0,
bool antialias=false)
- The function 'f' will be sampled at 'nx' and 'ny' evenly spaced
-points over a rectangle defined by the points 'initial' and 'final',
-respecting the current graphical scaling of 'pic'. The color space is
+ The function ‘f’ will be sampled at ‘nx’ and ‘ny’ evenly spaced
+points over a rectangle defined by the points ‘initial’ and ‘final’,
+respecting the current graphical scaling of ‘pic’. The color space is
scaled according to the z axis scaling (*note automatic scaling::). If
-'divs' > 1, the palette is quantized to 'divs'-1 values. A 'bounds'
+‘divs’ > 1, the palette is quantized to ‘divs’-1 values. A ‘bounds’
structure for the function values is returned:
struct bounds {
real min;
@@ -6667,16 +6715,16 @@ struct bounds {
}
This information can be used for generating an optional palette bar.
The palette color space corresponds to a range of values specified by
-the argument 'range', which can be 'Full', 'Automatic', or an explicit
-range 'Range(real min, real max)'. Here 'Full' specifies a range
+the argument ‘range’, which can be ‘Full’, ‘Automatic’, or an explicit
+range ‘Range(real min, real max)’. Here ‘Full’ specifies a range
varying from the minimum to maximum values of the function over the
-sampling interval, while 'Automatic' selects "nice" limits. The
-examples 'fillcontour.asy' and 'imagecontour.asy' illustrate how level
+sampling interval, while ‘Automatic’ selects "nice" limits. The
+examples ‘fillcontour.asy’ and ‘imagecontour.asy’ illustrate how level
sets (contour lines) can be drawn on a color density plot (*note
contour::).
A color density plot can also be generated from an explicit real[][]
-array 'data':
+array ‘data’:
bounds image(picture pic=currentpicture, real[][] f, range range=Full,
pair initial, pair final, pen[] palette, int divs=0,
bool transpose=(initial.x < final.x && initial.y < final.y),
@@ -6687,7 +6735,7 @@ convention (first index: x, second index: y) rather than the usual
matrix convention (first index: -y, second index: x).
To construct an image from an array of irregularly spaced points and
-an array of values 'f' at these points, use one of the routines
+an array of values ‘f’ at these points, use one of the routines
bounds image(picture pic=currentpicture, pair[] z, real[] f,
range range=Full, pen[] palette)
bounds image(picture pic=currentpicture, real[] x, real[] y, real[] f,
@@ -6698,11 +6746,11 @@ void palette(picture pic=currentpicture, Label L="", bounds bounds,
pair initial, pair final, axis axis=Right, pen[] palette,
pen p=currentpen, paletteticks ticks=PaletteTicks,
bool copy=true, bool antialias=false);
- The color space of 'palette' is taken to be over bounds 'bounds' with
-scaling given by the z scaling of 'pic'. The palette orientation is
-specified by 'axis', which may be one of 'Right', 'Left', 'Top', or
-'Bottom'. The bar is drawn over the rectangle from 'initial' to
-'final'. The argument 'paletteticks' is a special tick type (*note
+ The color space of ‘palette’ is taken to be over bounds ‘bounds’ with
+scaling given by the z scaling of ‘pic’. The palette orientation is
+specified by ‘axis’, which may be one of ‘Right’, ‘Left’, ‘Top’, or
+‘Bottom’. The bar is drawn over the rectangle from ‘initial’ to
+‘final’. The argument ‘paletteticks’ is a special tick type (*note
ticks::) that takes the following arguments:
paletteticks PaletteTicks(Label format="", ticklabel ticklabel=null,
bool beginlabel=true, bool endlabel=true,
@@ -6765,7 +6813,7 @@ palette("$f(x,y)$",range,(0,200),(100,250),Top,Palette,
[./logimage]
One can also draw an image directly from a two-dimensional pen array
-or a function 'pen f(int, int)':
+or a function ‘pen f(int, int)’:
void image(picture pic=currentpicture, pen[][] data,
pair initial, pair final,
bool transpose=(initial.x < final.x && initial.y < final.y),
@@ -6823,7 +6871,7 @@ image(f,N,N,(0,0),(300,300),antialias=true);
[./penfunctionimage]
- For convenience, the module 'palette' also defines functions that may
+ For convenience, the module ‘palette’ also defines functions that may
be used to construct a pen array from a given function and palette:
pen[] palette(real[] f, pen[] palette);
pen[][] palette(real[][] f, pen[] palette);
@@ -6831,18 +6879,18 @@ pen[][] palette(real[][] f, pen[] palette);

File: asymptote.info, Node: three, Next: obj, Prev: palette, Up: Base modules
-8.28 'three'
+8.28 ‘three’
============
-This module fully extends the notion of guides and paths in 'Asymptote'
+This module fully extends the notion of guides and paths in ‘Asymptote’
to three dimensions. It introduces the new types guide3, path3, and
surface. Guides in three dimensions are specified with the same syntax
-as in two dimensions except that triples '(x,y,z)' are used in place of
-pairs '(x,y)' for the nodes and direction specifiers. This
-generalization of John Hobby's spline algorithm is shape-invariant under
+as in two dimensions except that triples ‘(x,y,z)’ are used in place of
+pairs ‘(x,y)’ for the nodes and direction specifiers. This
+generalization of John Hobby’s spline algorithm is shape-invariant under
three-dimensional rotation, scaling, and shifting, and reduces in the
-planar case to the two-dimensional algorithm used in 'Asymptote',
-'MetaPost', and 'MetaFont' [cf. J. C. Bowman, Proceedings in Applied
+planar case to the two-dimensional algorithm used in ‘Asymptote’,
+‘MetaPost’, and ‘MetaFont’ [cf. J. C. Bowman, Proceedings in Applied
Mathematics and Mechanics, 7:1, 2010021-2010022 (2007)].
For example, a unit circle in the XY plane may be filled and drawn
@@ -6869,13 +6917,13 @@ dot(g,red);
[./saddle]
- Module 'three' provides constructors for converting two-dimensional
+ Module ‘three’ provides constructors for converting two-dimensional
paths to three-dimensional ones, and vice-versa:
path3 path3(path p, triple plane(pair)=XYplane);
path path(path3 p, pair P(triple)=xypart);
A Bezier surface, the natural two-dimensional generalization of
-Bezier curves, is defined in 'three_surface.asy' as a structure
+Bezier curves, is defined in ‘three_surface.asy’ as a structure
containing an array of Bezier patches. Surfaces may drawn with one of
the routines
void draw(picture pic=currentpicture, surface s, int nu=1, int nv=1,
@@ -6891,10 +6939,10 @@ void draw(picture pic=currentpicture, surface s, int nu=1, int nv=1,
light light=currentlight, light meshlight=nolight, string name="",
render render=defaultrender);
- The parameters 'nu' and 'nv' specify the number of subdivisions for
-drawing optional mesh lines for each Bezier patch. The optional 'name'
+ The parameters ‘nu’ and ‘nv’ specify the number of subdivisions for
+drawing optional mesh lines for each Bezier patch. The optional ‘name’
parameter is used as a prefix for naming the surface patches in the PRC
-model tree. Here material is a structure defined in 'three_light.asy':
+model tree. Here material is a structure defined in ‘three_light.asy’:
struct material {
pen[] p; // diffusepen,emissivepen,specularpen
real opacity;
@@ -6903,8 +6951,8 @@ struct material {
real fresnel0;
}
These material properties are used to implement physically based
-rendering (PBR) using light properties defined in 'plain_prethree.asy'
-and 'three_light.asy':
+rendering (PBR) using light properties defined in ‘plain_prethree.asy’
+and ‘three_light.asy’:
struct light {
real[][] diffuse;
real[][] specular;
@@ -6925,38 +6973,38 @@ light Headlamp=light(gray(0.8),specular=gray(0.7),
currentlight=Headlamp;
light nolight;
- The 'currentlight.background' (or 'background' member of the
-specified 'light') can be used to set the background colour for 2D (or
-3D) images. The default background is white for 'HTML' images and
+ The ‘currentlight.background’ (or ‘background’ member of the
+specified ‘light’) can be used to set the background colour for 2D (or
+3D) images. The default background is white for ‘HTML’ images and
transparent for all other formats. One can request a completely
-transparent background for 3D 'WebGL' images with
-'currentlight.background=black+opacity(0.0);'
+transparent background for 3D ‘WebGL’ images with
+‘currentlight.background=black+opacity(0.0);’
Asymptote also supports image-based lighting with the setting
-'settings.ibl=true'. This uses pre-rendered EXR images from the
-directory specified by '-imageDir' (which defaults to 'ibl') or, for
-'WebGL' rendering, the URL specified by '-imageURL' (which defaults to
+‘settings.ibl=true’. This uses pre-rendered EXR images from the
+directory specified by ‘-imageDir’ (which defaults to ‘ibl’) or, for
+‘WebGL’ rendering, the URL specified by ‘-imageURL’ (which defaults to
<https://vectorgraphics.gitlab.io/asymptote/ibl>). Additional rendered
-images can be generated on an 'NVIDIA' GPU using the 'reflect' program
-in the 'cudareflect' subdirectory of the 'Asymptote' source directory.
+images can be generated on an ‘NVIDIA’ GPU using the ‘reflect’ program
+in the ‘cudareflect’ subdirectory of the ‘Asymptote’ source directory.
Sample Bezier surfaces are contained in the example files
-'BezierSurface.asy', 'teapot.asy', 'teapotIBL.asy', and
-'parametricsurface.asy'.
+‘BezierSurface.asy’, ‘teapot.asy’, ‘teapotIBL.asy’, and
+‘parametricsurface.asy’.
- The structure 'render' contains specialized rendering options
-documented at the beginning of module 'three'.
+ The structure ‘render’ contains specialized rendering options
+documented at the beginning of module ‘three’.
- The examples 'elevation.asy' and 'sphericalharmonic.asy' illustrate
+ The examples ‘elevation.asy’ and ‘sphericalharmonic.asy’ illustrate
how to draw a surface with patch-dependent colors. The examples
-'vertexshading.asy' and 'smoothelevation.asy' illustrate
-vertex-dependent colors, which are supported by 'Asymptote''s native
-'OpenGL'/'WebGL' renderers and the two-dimensional vector output format
-('settings.render=0'). Since the PRC output format does not currently
+‘vertexshading.asy’ and ‘smoothelevation.asy’ illustrate
+vertex-dependent colors, which are supported by ‘Asymptote’’s native
+‘OpenGL’/‘WebGL’ renderers and the two-dimensional vector output format
+(‘settings.render=0’). Since the PRC output format does not currently
support vertex shading of Bezier surfaces, PRC patches are shaded with
the mean of the four vertex colors.
- A surface can be constructed from a cyclic 'path3' with the
+ A surface can be constructed from a cyclic ‘path3’ with the
constructor
surface surface(path3 external, triple[] internal=new triple[],
pen[] colors=new pen[], bool3 planar=default);
@@ -6969,16 +7017,16 @@ draw(surface(unitcircle3,new pen[] {red,green,blue,black}),nolight);
The first example draws a Bezier patch and the second example draws a
Bezier triangle. The third and fourth examples are planar surfaces.
The last example constructs a patch with vertex-specific colors. A
-three-dimensional planar surface in the plane 'plane' can be constructed
-from a two-dimensional cyclic path 'g' with the constructor
+three-dimensional planar surface in the plane ‘plane’ can be constructed
+from a two-dimensional cyclic path ‘g’ with the constructor
surface surface(path p, triple plane(pair)=XYplane);
and then filled:
draw(surface((0,0)--E+2N--2E--E+N..0.2E..cycle),red);
-Planar Bezier surfaces patches are constructed using Orest Shardt's
-'bezulate' routine, which decomposes (possibly nonsimply connected)
-regions bounded (according to the 'zerowinding' fill rule) by simple
+Planar Bezier surfaces patches are constructed using Orest Shardt’s
+‘bezulate’ routine, which decomposes (possibly nonsimply connected)
+regions bounded (according to the ‘zerowinding’ fill rule) by simple
cyclic paths (intersecting only at the endpoints) into subregions
-bounded by cyclic paths of length '4' or less.
+bounded by cyclic paths of length ‘4’ or less.
A more efficient routine also exists for drawing tessellations
composed of many 3D triangles, with specified vertices, and optional
@@ -6986,40 +7034,40 @@ normals or vertex colors:
void draw(picture pic=currentpicture, triple[] v, int[][] vi,
triple[] n={}, int[][] ni=vi, material m=currentpen, pen[] p={},
int[][] pi=vi, light light=currentlight);
- Here, the triple array 'v' lists the (typically distinct) vertices,
-while the array 'vi' contains integer arrays of length 3 containing the
-indices of the elements in 'v' that form the vertices of each triangle.
-Similarly, the arguments 'n' and 'ni' contain optional normal data and
-'p' and 'pi' contain optional pen vertex data. If more than one normal
+ Here, the triple array ‘v’ lists the (typically distinct) vertices,
+while the array ‘vi’ contains integer arrays of length 3 containing the
+indices of the elements in ‘v’ that form the vertices of each triangle.
+Similarly, the arguments ‘n’ and ‘ni’ contain optional normal data and
+‘p’ and ‘pi’ contain optional pen vertex data. If more than one normal
or pen is specified for a vertex, the last one is used. An example of
-this tessellation facility is given in 'triangles.asy'.
+this tessellation facility is given in ‘triangles.asy’.
Arbitrary thick three-dimensional curves and line caps (which the
-'OpenGL' standard does not require implementations to provide) are
+‘OpenGL’ standard does not require implementations to provide) are
constructed with
tube tube(path3 p, real width, render render=defaultrender);
-this returns a tube structure representing a tube of diameter 'width'
-centered approximately on 'g'. The tube structure consists of a surface
-'s' and the actual tube center, path3 'center'. Drawing thick lines as
-tubes can be slow to render, especially with the 'Adobe Reader'
-renderer. The setting 'thick=false' can be used to disable this feature
-and force all lines to be drawn with 'linewidth(0)' (one pixel wide,
+this returns a tube structure representing a tube of diameter ‘width’
+centered approximately on ‘g’. The tube structure consists of a surface
+‘s’ and the actual tube center, path3 ‘center’. Drawing thick lines as
+tubes can be slow to render, especially with the ‘Adobe Reader’
+renderer. The setting ‘thick=false’ can be used to disable this feature
+and force all lines to be drawn with ‘linewidth(0)’ (one pixel wide,
regardless of the resolution). By default, mesh and contour lines in
three-dimensions are always drawn thin, unless an explicit line width is
-given in the pen parameter or the setting 'thin' is set to 'false'. The
-pens 'thin()' and 'thick()' defined in 'plain_pens.asy' can also be used
+given in the pen parameter or the setting ‘thin’ is set to ‘false’. The
+pens ‘thin()’ and ‘thick()’ defined in ‘plain_pens.asy’ can also be used
to override these defaults for specific draw commands.
-There are six choices for viewing 3D 'Asymptote' output:
+There are six choices for viewing 3D ‘Asymptote’ output:
- 1. Use the native 'Asymptote' adaptive 'OpenGL'-based renderer (with
- the command-line option '-V' and the default settings
- 'outformat=""' and 'render=-1'). On 'UNIX' systems with graphics
+ 1. Use the native ‘Asymptote’ adaptive ‘OpenGL’-based renderer (with
+ the command-line option ‘-V’ and the default settings
+ ‘outformat=""’ and ‘render=-1’). On ‘UNIX’ systems with graphics
support for multisampling, the sample width can be controlled with
- the setting 'multisample'. The ratio of physical to logical screen
- pixels can be specified with the setting 'devicepixelratio'. An
+ the setting ‘multisample’. The ratio of physical to logical screen
+ pixels can be specified with the setting ‘devicepixelratio’. An
initial screen position can be specified with the pair setting
- 'position', where negative values are interpreted as relative to
+ ‘position’, where negative values are interpreted as relative to
the corresponding maximum screen dimension. The default settings
import settings;
leftbutton=new string[] {"rotate","zoom","shift","pan"};
@@ -7028,120 +7076,130 @@ There are six choices for viewing 3D 'Asymptote' output:
wheelup=new string[] {"zoomin"};
wheeldown=new string[] {"zoomout"};
bind the mouse buttons as follows:
- * Left: rotate
- * Shift Left: zoom
- * Ctrl Left: shift viewport
- * Alt Left: pan
- * Wheel Up: zoom in
- * Wheel Down: zoom out
- * Right: zoom
- * Shift Right: rotate about the X axis
- * Ctrl Right: rotate about the Y axis
- * Alt Right: rotate about the Z axis
+ • Left: rotate
+ • Shift Left: zoom
+ • Ctrl Left: shift viewport
+ • Alt Left: pan
+ • Wheel Up: zoom in
+ • Wheel Down: zoom out
+ • Right: zoom
+ • Shift Right: rotate about the X axis
+ • Ctrl Right: rotate about the Y axis
+ • Alt Right: rotate about the Z axis
The keyboard bindings are:
- * h: home
- * f: toggle fitscreen
- * x: spin about the X axis
- * y: spin about the Y axis
- * z: spin about the Z axis
- * s: stop spinning
- * m: rendering mode (solid/patch/mesh)
- * e: export
- * c: show camera parameters
- * p: play animation
- * r: reverse animation
- * : step animation
- * +: expand
- * =: expand
- * >: expand
- * -: shrink
- * _: shrink
- * <: shrink
- * q: exit
- * Ctrl-q: exit
-
- 2. Generate 'WebGL' interactive vector graphics output with the the
- command-line option and '-f html' (or the setting
- 'outformat="html"'). The resulting 3D HTML file can then be viewed
+ • h: home
+ • f: toggle fitscreen
+ • x: spin about the X axis
+ • y: spin about the Y axis
+ • z: spin about the Z axis
+ • s: stop spinning
+ • m: rendering mode (solid/patch/mesh)
+ • e: export
+ • c: show camera parameters
+ • p: play animation
+ • r: reverse animation
+ • : step animation
+ • +: expand
+ • =: expand
+ • >: expand
+ • -: shrink
+ • _: shrink
+ • <: shrink
+ • q: exit
+ • Ctrl-q: exit
+
+ 2. Generate ‘WebGL’ interactive vector graphics output with the the
+ command-line option and ‘-f html’ (or the setting
+ ‘outformat="html"’). The resulting 3D HTML file can then be viewed
directly in any modern desktop or mobile browser, or even embedded
within another web page:
<iframe src="logo3.html" width="561" height="321" frameborder="0">
</iframe>
- Normally, 'WebGL' files generated by 'Asymptote' are dynamically
+ Normally, ‘WebGL’ files generated by ‘Asymptote’ are dynamically
remeshed to fit the browser window dimensions. However, the
- setting 'absolute=true' can be used to force the image to be
+ setting ‘absolute=true’ can be used to force the image to be
rendered at its designed size (accounting for multiple device
- pixels per 'css' pixel).
+ pixels per ‘css’ pixel).
- The interactive 'WebGL' files produced by 'Asymptote' use the
- default mouse and (many of the same) key bindings as the 'OpenGL'
- renderer. Zooming via the mouse wheel of a 'WebGL' image embedded
+ The interactive ‘WebGL’ files produced by ‘Asymptote’ use the
+ default mouse and (many of the same) key bindings as the ‘OpenGL’
+ renderer. Zooming via the mouse wheel of a ‘WebGL’ image embedded
within another page is disabled until the image is activated by a
- click or touch event and will remain enabled until the 'ESC' key is
+ click or touch event and will remain enabled until the ‘ESC’ key is
pressed.
By default, viewing the 3D HTML files generated by Asymptote
- requires network access to download the 'AsyGL' rendering library,
+ requires network access to download the ‘AsyGL’ rendering library,
which is normally cached by the browser for future use. However,
- the setting 'offline=true' can be used to embed this small (about
+ the setting ‘offline=true’ can be used to embed this small (about
48kB) library within a stand-alone HTML file that can be viewed
offline.
- 3. Render the scene to a specified rasterized format 'outformat' at
- the resolution of 'n' pixels per 'bp', as specified by the setting
- 'render=n'. A negative value of 'n' is interpreted as '|2n|' for
- EPS and PDF formats and '|n|' for other formats. The default value
- of 'render' is -1. By default, the scene is internally rendered at
+ 3. Render the scene to a specified rasterized format ‘outformat’ at
+ the resolution of ‘n’ pixels per ‘bp’, as specified by the setting
+ ‘render=n’. A negative value of ‘n’ is interpreted as ‘|2n|’ for
+ EPS and PDF formats and ‘|n|’ for other formats. The default value
+ of ‘render’ is -1. By default, the scene is internally rendered at
twice the specified resolution; this can be disabled by setting
- 'antialias=1'. High resolution rendering is done by tiling the
+ ‘antialias=1’. High resolution rendering is done by tiling the
image. If your graphics card allows it, the rendering can be made
- more efficient by increasing the maximum tile size 'maxtile' to
- your screen dimensions (indicated by 'maxtile=(0,0)'. If your
+ more efficient by increasing the maximum tile size ‘maxtile’ to
+ your screen dimensions (indicated by ‘maxtile=(0,0)’. If your
video card generates unwanted black stripes in the output, try
- setting the horizontal and vertical components of 'maxtiles' to
+ setting the horizontal and vertical components of ‘maxtiles’ to
something less than your screen dimensions. The tile size is also
- limited by the setting 'maxviewport', which restricts the maximum
+ limited by the setting ‘maxviewport’, which restricts the maximum
width and height of the viewport. Some graphics drivers support
- batch mode ('-noV') rendering in an iconified window; this can be
- enabled with the setting 'iconify=true'.
+ batch mode (‘-noV’) rendering in an iconified window; this can be
+ enabled with the setting ‘iconify=true’.
4. Embed the 3D PRC format in a PDF file and view the resulting PDF
- file with version '9.0' or later of 'Adobe Reader'. This requires
- 'settings.outformat="pdf"' and 'settings.prc=true', which can be
- specified by the command-line options '-f pdf' and '-f prc', put in
- the 'Asymptote' configuration file (*note configuration file::), or
- specified in the script before module 'three' (or 'graph3') is
- imported. The 'media9' LaTeX package is also required (*note
- embed::). The example '100d.asy' illustrates how one can generate
- a list of predefined views (see '100d.views'). A stationary
- preview image with a resolution of 'n' pixels per 'bp' can be
- embedded with the setting 'render=n'; this allows the file to be
- viewed with other 'PDF' viewers. Alternatively, the file
- 'externalprc.tex' illustrates how the resulting PRC and rendered
- image files can be extracted and processed in a separate 'LaTeX'
+ file with version ‘9.0’ or later of ‘Adobe Reader’. This requires
+ ‘settings.outformat="pdf"’ and ‘settings.prc=true’, which can be
+ specified by the command-line options ‘-f pdf’ and ‘-f prc’, put in
+ the ‘Asymptote’ configuration file (*note configuration file::), or
+ specified in the script before module ‘three’ (or ‘graph3’) is
+ imported. The ‘media9’ LaTeX package is also required (*note
+ embed::). The example ‘100d.asy’ illustrates how one can generate
+ a list of predefined views (see ‘100d.views’). A stationary
+ preview image with a resolution of ‘n’ pixels per ‘bp’ can be
+ embedded with the setting ‘render=n’; this allows the file to be
+ viewed with other ‘PDF’ viewers. Alternatively, the file
+ ‘externalprc.tex’ illustrates how the resulting PRC and rendered
+ image files can be extracted and processed in a separate ‘LaTeX’
file. However, see *note LaTeX usage:: for an easier way to embed
- three-dimensional 'Asymptote' pictures within 'LaTeX'. For
+ three-dimensional ‘Asymptote’ pictures within ‘LaTeX’. For
specialized applications where only the raw PRC file is required,
- specify 'settings.outformat="prc"'. The PRC specification is
+ specify ‘settings.outformat="prc"’. The PRC specification is
available from
<https://web.archive.org/web/20081204104459/http://livedocs.adobe.com/acrobat_sdk/9/Acrobat9_HTMLHelp/API_References/PRCReference/PRC_Format_Specification/>
- 5. Output a 'V3D' portable compressed binary file for viewing with an
- external viewer or conversion to an alternate 3D format with the
- Python 'pyv3d' library. The 'V3D' specification and the 'pyv3d'
- library are available at <https://github.com/vectorgraphics/v3d>.
- A 'V3D' file 'file.v3d' may be imported and viewed by 'Asymptote'
- either by specifying 'file.v3d' on the command line
+ 5. Output a V3D portable compressed vector graphics file using
+ ‘settings.outformat="v3d"’, which can be viewed with an external
+ viewer or converted to an alternate 3D format using the Python
+ ‘pyv3d’ library. V3D content can be automatically embedded within
+ a PDF file using the options ‘settings.outformat="pdf"’ and
+ ‘settings.v3d=true’. Alternatively, a V3D file ‘file.v3d’ may be
+ manually embedded within a PDF file using the ‘media9’ ‘LaTeX’
+ package:
+ \includemedia[noplaybutton,width=100pt,height=200pt]{}{file.v3d}%
+ An online ‘Javascript’-based V3D-aware ‘PDF’ viewer is available at
+ <https://github.com/vectorgraphics/pdfv3dReader>.
+
+ The V3D specification and the ‘pyv3d’ library are available at
+ <https://github.com/vectorgraphics/v3d>. A V3D file ‘file.v3d’ may
+ be imported and viewed by ‘Asymptote’ either by specifying
+ ‘file.v3d’ on the command line
asy -V file.v3d
- or using the 'v3d' module and 'importv3d' function in interactive
- mode (or within an 'Asymptote' file):
+ or using the ‘v3d’ module and ‘importv3d’ function in interactive
+ mode (or within an ‘Asymptote’ file):
import v3d;
importv3d("file.v3d");
6. Project the scene to a two-dimensional vector (EPS or PDF) format
- with 'render=0'. Only limited support for hidden surface removal,
+ with ‘render=0’. Only limited support for hidden surface removal,
lighting, and transparency is available with this approach (*note
PostScript3D::).
@@ -7154,121 +7212,121 @@ void size3(picture pic=currentpicture, real x, real y=x, real z=y,
A simplex linear programming problem is then solved to produce a 3D
version of a frame (actually implemented as a 3D picture). The result
is then fit with another application of deferred drawing to the viewport
-dimensions corresponding to the usual two-dimensional picture 'size'
-parameters. The global pair 'viewportmargin' may be used to add
+dimensions corresponding to the usual two-dimensional picture ‘size’
+parameters. The global pair ‘viewportmargin’ may be used to add
horizontal and vertical margins to the viewport dimensions.
-Alternatively, a minimum 'viewportsize' may be specified. A 3D picture
-'pic' can be explicitly fit to a 3D frame by calling
+Alternatively, a minimum ‘viewportsize’ may be specified. A 3D picture
+‘pic’ can be explicitly fit to a 3D frame by calling
frame pic.fit3(projection P=currentprojection);
-and then added to picture 'dest' about 'position' with
+and then added to picture ‘dest’ about ‘position’ with
void add(picture dest=currentpicture, frame src, triple position=(0,0,0));
- For convenience, the 'three' module defines 'O=(0,0,0)', 'X=(1,0,0)',
-'Y=(0,1,0)', and 'Z=(0,0,1)', along with a unitcircle in the XY plane:
+ For convenience, the ‘three’ module defines ‘O=(0,0,0)’, ‘X=(1,0,0)’,
+‘Y=(0,1,0)’, and ‘Z=(0,0,1)’, along with a unitcircle in the XY plane:
path3 unitcircle3=X..Y..-X..-Y..cycle;
A general (approximate) circle can be drawn perpendicular to the
-direction 'normal' with the routine
+direction ‘normal’ with the routine
path3 circle(triple c, real r, triple normal=Z);
- A circular arc centered at 'c' with radius 'r' from
-'c+r*dir(theta1,phi1)' to 'c+r*dir(theta2,phi2)', drawing
+ A circular arc centered at ‘c’ with radius ‘r’ from
+‘c+r*dir(theta1,phi1)’ to ‘c+r*dir(theta2,phi2)’, drawing
counterclockwise relative to the normal vector
-'cross(dir(theta1,phi1),dir(theta2,phi2))' if 'theta2 > theta1' or if
-'theta2 == theta1' and 'phi2 >= phi1', can be constructed with
+‘cross(dir(theta1,phi1),dir(theta2,phi2))’ if ‘theta2 > theta1’ or if
+‘theta2 == theta1’ and ‘phi2 >= phi1’, can be constructed with
path3 arc(triple c, real r, real theta1, real phi1, real theta2, real phi2,
triple normal=O);
- The normal must be explicitly specified if 'c' and the endpoints are
-colinear. If 'r' < 0, the complementary arc of radius '|r|' is
-constructed. For convenience, an arc centered at 'c' from triple 'v1'
-to 'v2' (assuming '|v2-c|=|v1-c|') in the direction CCW
+ The normal must be explicitly specified if ‘c’ and the endpoints are
+colinear. If ‘r’ < 0, the complementary arc of radius ‘|r|’ is
+constructed. For convenience, an arc centered at ‘c’ from triple ‘v1’
+to ‘v2’ (assuming ‘|v2-c|=|v1-c|’) in the direction CCW
(counter-clockwise) or CW (clockwise) may also be constructed with
path3 arc(triple c, triple v1, triple v2, triple normal=O,
bool direction=CCW);
-When high accuracy is needed, the routines 'Circle' and 'Arc' defined in
-'graph3' may be used instead. See *note GaussianSurface:: for an
+When high accuracy is needed, the routines ‘Circle’ and ‘Arc’ defined in
+‘graph3’ may be used instead. See *note GaussianSurface:: for an
example of a three-dimensional circular arc.
- The representation 'O--O+u--O+u+v--O+v--cycle' of the plane passing
-through point 'O' with normal 'cross(u,v)' is returned by
+ The representation ‘O--O+u--O+u+v--O+v--cycle’ of the plane passing
+through point ‘O’ with normal ‘cross(u,v)’ is returned by
path3 plane(triple u, triple v, triple O=O);
- A three-dimensional box with opposite vertices at triples 'v1' and
-'v2' may be drawn with the function
+ A three-dimensional box with opposite vertices at triples ‘v1’ and
+‘v2’ may be drawn with the function
path3[] box(triple v1, triple v2);
For example, a unit box is predefined as
path3[] unitbox=box(O,(1,1,1));
- 'Asymptote' also provides optimized definitions for the
-three-dimensional paths 'unitsquare3' and 'unitcircle3', along with the
-surfaces 'unitdisk', 'unitplane', 'unitcube', 'unitcylinder',
-'unitcone', 'unitsolidcone', 'unitfrustum(real t1, real t2)',
-'unitsphere', and 'unithemisphere'.
+ ‘Asymptote’ also provides optimized definitions for the
+three-dimensional paths ‘unitsquare3’ and ‘unitcircle3’, along with the
+surfaces ‘unitdisk’, ‘unitplane’, ‘unitcube’, ‘unitcylinder’,
+‘unitcone’, ‘unitsolidcone’, ‘unitfrustum(real t1, real t2)’,
+‘unitsphere’, and ‘unithemisphere’.
These projections to two dimensions are predefined:
-'oblique'
-'oblique(real angle)'
- The point '(x,y,z)' is projected to '(x-0.5z,y-0.5z)'. If an
+‘oblique’
+‘oblique(real angle)’
+ The point ‘(x,y,z)’ is projected to ‘(x-0.5z,y-0.5z)’. If an
optional real argument is given, the negative z axis is drawn at
- this angle in degrees. The projection 'obliqueZ' is a synonym for
- 'oblique'.
+ this angle in degrees. The projection ‘obliqueZ’ is a synonym for
+ ‘oblique’.
-'obliqueX'
-'obliqueX(real angle)'
- The point '(x,y,z)' is projected to '(y-0.5x,z-0.5x)'. If an
+‘obliqueX’
+‘obliqueX(real angle)’
+ The point ‘(x,y,z)’ is projected to ‘(y-0.5x,z-0.5x)’. If an
optional real argument is given, the negative x axis is drawn at
this angle in degrees.
-'obliqueY'
-'obliqueY(real angle)'
- The point '(x,y,z)' is projected to '(x+0.5y,z+0.5y)'. If an
+‘obliqueY’
+‘obliqueY(real angle)’
+ The point ‘(x,y,z)’ is projected to ‘(x+0.5y,z+0.5y)’. If an
optional real argument is given, the positive y axis is drawn at
this angle in degrees.
-'orthographic(triple camera, triple up=Z, triple target=O,
+‘orthographic(triple camera, triple up=Z, triple target=O,
real zoom=1, pair viewportshift=0, bool showtarget=true,
- bool center=false)'
+ bool center=false)’
This projects from three to two dimensions using the view as seen
- at a point infinitely far away in the direction 'unit(camera)',
- orienting the camera so that, if possible, the vector 'up' points
+ at a point infinitely far away in the direction ‘unit(camera)’,
+ orienting the camera so that, if possible, the vector ‘up’ points
upwards. Parallel lines are projected to parallel lines. The
- bounding volume is expanded to include 'target' if
- 'showtarget=true'. If 'center=true', the target will be adjusted
+ bounding volume is expanded to include ‘target’ if
+ ‘showtarget=true’. If ‘center=true’, the target will be adjusted
to the center of the bounding volume.
-'orthographic(real x, real y, real z, triple up=Z, triple target=O,
+‘orthographic(real x, real y, real z, triple up=Z, triple target=O,
real zoom=1, pair viewportshift=0, bool showtarget=true,
- bool center=false)'
+ bool center=false)’
This is equivalent to
orthographic((x,y,z),up,target,zoom,viewportshift,showtarget,center)
The routine
triple camera(real alpha, real beta);
can be used to compute the camera position with the x axis below
- the horizontal at angle 'alpha', the y axis below the horizontal at
- angle 'beta', and the z axis up.
+ the horizontal at angle ‘alpha’, the y axis below the horizontal at
+ angle ‘beta’, and the z axis up.
-'perspective(triple camera, triple up=Z, triple target=O,
+‘perspective(triple camera, triple up=Z, triple target=O,
real zoom=1, real angle=0, pair viewportshift=0,
bool showtarget=true, bool autoadjust=true,
- bool center=autoadjust)'
+ bool center=autoadjust)’
This projects from three to two dimensions, taking account of
- perspective, as seen from the location 'camera' looking at
- 'target', orienting the camera so that, if possible, the vector
- 'up' points upwards. If 'autoadjust=true', the camera will
+ perspective, as seen from the location ‘camera’ looking at
+ ‘target’, orienting the camera so that, if possible, the vector
+ ‘up’ points upwards. If ‘autoadjust=true’, the camera will
automatically be adjusted to lie outside the bounding volume for
- all possible interactive rotations about 'target'. If
- 'center=true', the target will be adjusted to the center of the
+ all possible interactive rotations about ‘target’. If
+ ‘center=true’, the target will be adjusted to the center of the
bounding volume.
-'perspective(real x, real y, real z, triple up=Z, triple target=O,
+‘perspective(real x, real y, real z, triple up=Z, triple target=O,
real zoom=1, real angle=0, pair viewportshift=0,
bool showtarget=true, bool autoadjust=true,
- bool center=autoadjust)'
+ bool center=autoadjust)’
This is equivalent to
perspective((x,y,z),up,target,zoom,angle,viewportshift,showtarget,
autoadjust,center)
-The default projection, 'currentprojection', is initially set to
-'perspective(5,4,2)'.
+The default projection, ‘currentprojection’, is initially set to
+‘perspective(5,4,2)’.
We also define standard orthographic views used in technical drawing:
projection LeftView=orthographic(-X,showtarget=true);
@@ -7281,10 +7339,10 @@ The function
void addViews(picture dest=currentpicture, picture src,
projection[][] views=SixViewsUS,
bool group=true, filltype filltype=NoFill);
-adds to picture 'dest' an array of views of picture 'src' using the
-layout projection[][] 'views'. The default layout 'SixViewsUS' aligns
-the projection 'FrontView' below 'TopView' and above 'BottomView', to
-the right of 'LeftView' and left of 'RightView' and 'BackView'. The
+adds to picture ‘dest’ an array of views of picture ‘src’ using the
+layout projection[][] ‘views’. The default layout ‘SixViewsUS’ aligns
+the projection ‘FrontView’ below ‘TopView’ and above ‘BottomView’, to
+the right of ‘LeftView’ and left of ‘RightView’ and ‘BackView’. The
predefined layouts are:
projection[][] ThreeViewsUS={{TopView},
{FrontView,RightView}};
@@ -7307,44 +7365,44 @@ projection[][] SixViews={{FrontView,TopView,RightView},
A triple or path3 can be projected to a pair or path, with
-'project(triple, projection P=currentprojection)' or 'project(path3,
-projection P=currentprojection)'.
+‘project(triple, projection P=currentprojection)’ or ‘project(path3,
+projection P=currentprojection)’.
It is occasionally useful to be able to invert a projection, sending
-a pair 'z' onto the plane perpendicular to 'normal' and passing through
-'point':
+a pair ‘z’ onto the plane perpendicular to ‘normal’ and passing through
+‘point’:
triple invert(pair z, triple normal, triple point,
projection P=currentprojection);
-A pair 'z' on the projection plane can be inverted to a triple with the
+A pair ‘z’ on the projection plane can be inverted to a triple with the
routine
triple invert(pair z, projection P=currentprojection);
-A pair direction 'dir' on the projection plane can be inverted to a
-triple direction relative to a point 'v' with the routine
+A pair direction ‘dir’ on the projection plane can be inverted to a
+triple direction relative to a point ‘v’ with the routine
triple invert(pair dir, triple v, projection P=currentprojection).
Three-dimensional objects may be transformed with one of the
following built-in transform3 types (the identity transformation is
-'identity4'):
-
-'shift(triple v)'
- translates by the triple 'v';
-'xscale3(real x)'
- scales by 'x' in the x direction;
-'yscale3(real y)'
- scales by 'y' in the y direction;
-'zscale3(real z)'
- scales by 'z' in the z direction;
-'scale3(real s)'
- scales by 's' in the x, y, and z directions;
-'scale(real x, real y, real z)'
- scales by 'x' in the x direction, by 'y' in the y direction, and by
- 'z' in the z direction;
-'rotate(real angle, triple v)'
- rotates by 'angle' in degrees about the axis 'O--v';
-'rotate(real angle, triple u, triple v)'
- rotates by 'angle' in degrees about the axis 'u--v';
-'reflect(triple u, triple v, triple w)'
- reflects about the plane through 'u', 'v', and 'w'.
+‘identity4’):
+
+‘shift(triple v)’
+ translates by the triple ‘v’;
+‘xscale3(real x)’
+ scales by ‘x’ in the x direction;
+‘yscale3(real y)’
+ scales by ‘y’ in the y direction;
+‘zscale3(real z)’
+ scales by ‘z’ in the z direction;
+‘scale3(real s)’
+ scales by ‘s’ in the x, y, and z directions;
+‘scale(real x, real y, real z)’
+ scales by ‘x’ in the x direction, by ‘y’ in the y direction, and by
+ ‘z’ in the z direction;
+‘rotate(real angle, triple v)’
+ rotates by ‘angle’ in degrees about the axis ‘O--v’;
+‘rotate(real angle, triple u, triple v)’
+ rotates by ‘angle’ in degrees about the axis ‘u--v’;
+‘reflect(triple u, triple v, triple w)’
+ reflects about the plane through ‘u’, ‘v’, and ‘w’.
When not multiplied on the left by a transform3, three-dimensional
TeX Labels are drawn as Bezier surfaces directly on the projection
@@ -7354,70 +7412,70 @@ void label(picture pic=currentpicture, Label L, triple position,
light light=nolight, string name="",
render render=defaultrender, interaction interaction=
settings.autobillboard ? Billboard : Embedded)
-The optional 'name' parameter is used as a prefix for naming the label
-patches in the PRC model tree. The default interaction is 'Billboard',
+The optional ‘name’ parameter is used as a prefix for naming the label
+patches in the PRC model tree. The default interaction is ‘Billboard’,
which means that labels are rotated interactively so that they always
-face the camera. The interaction 'Embedded' means that the label
-interacts as a normal '3D' surface, as illustrated in the example
-'billboard.asy'. Alternatively, a label can be transformed from the
-'XY' plane by an explicit transform3 or mapped to a specified
-two-dimensional plane with the predefined transform3 types 'XY', 'YZ',
-'ZX', 'YX', 'ZY', 'ZX'. There are also modified versions of these
-transforms that take an optional argument 'projection
-P=currentprojection' that rotate and/or flip the label so that it is
+face the camera. The interaction ‘Embedded’ means that the label
+interacts as a normal ‘3D’ surface, as illustrated in the example
+‘billboard.asy’. Alternatively, a label can be transformed from the
+‘XY’ plane by an explicit transform3 or mapped to a specified
+two-dimensional plane with the predefined transform3 types ‘XY’, ‘YZ’,
+‘ZX’, ‘YX’, ‘ZY’, ‘ZX’. There are also modified versions of these
+transforms that take an optional argument ‘projection
+P=currentprojection’ that rotate and/or flip the label so that it is
more readable from the initial viewpoint.
- A transform3 that projects in the direction 'dir' onto the plane with
-normal 'n' through point 'O' is returned by
+ A transform3 that projects in the direction ‘dir’ onto the plane with
+normal ‘n’ through point ‘O’ is returned by
transform3 planeproject(triple n, triple O=O, triple dir=n);
One can use
triple normal(path3 p);
-to find the unit normal vector to a planar three-dimensional path 'p'.
-As illustrated in the example 'planeproject.asy', a transform3 that
-projects in the direction 'dir' onto the plane defined by a planar path
-'p' is returned by
+to find the unit normal vector to a planar three-dimensional path ‘p’.
+As illustrated in the example ‘planeproject.asy’, a transform3 that
+projects in the direction ‘dir’ onto the plane defined by a planar path
+‘p’ is returned by
transform3 planeproject(path3 p, triple dir=normal(p));
The functions
surface extrude(path p, triple axis=Z);
surface extrude(Label L, triple axis=Z);
-return the surface obtained by extruding path 'p' or Label 'L' along
-'axis'.
+return the surface obtained by extruding path ‘p’ or Label ‘L’ along
+‘axis’.
- Three-dimensional versions of the path functions 'length', 'size',
-'point', 'dir', 'accel', 'radius', 'precontrol', 'postcontrol',
-'arclength', 'arctime', 'reverse', 'subpath', 'intersect',
-'intersections', 'intersectionpoint', 'intersectionpoints', 'min',
-'max', 'cyclic', and 'straight' are also defined.
+ Three-dimensional versions of the path functions ‘length’, ‘size’,
+‘point’, ‘dir’, ‘accel’, ‘radius’, ‘precontrol’, ‘postcontrol’,
+‘arclength’, ‘arctime’, ‘reverse’, ‘subpath’, ‘intersect’,
+‘intersections’, ‘intersectionpoint’, ‘intersectionpoints’, ‘min’,
+‘max’, ‘cyclic’, and ‘straight’ are also defined.
The routine
real[] intersect(path3 p, surface s, real fuzz=-1);
returns a real array of length 3 containing the intersection times, if
-any, of a path 'p' with a surface 's'. The routine
+any, of a path ‘p’ with a surface ‘s’. The routine
real[][] intersections(path3 p, surface s, real fuzz=-1);
returns all (unless there are infinitely many) intersection times of a
-path 'p' with a surface 's' as a sorted array of real arrays of length
+path ‘p’ with a surface ‘s’ as a sorted array of real arrays of length
3, and
triple[] intersectionpoints(path3 p, surface s, real fuzz=-1);
returns the corresponding intersection points. Here, the computations
-are performed to the absolute error specified by 'fuzz', or if 'fuzz <
-0', to machine precision. The routine
+are performed to the absolute error specified by ‘fuzz’, or if ‘fuzz <
+0’, to machine precision. The routine
real orient(triple a, triple b, triple c, triple d);
-is a numerically robust computation of 'dot(cross(a-d,b-d),c-d)', which
+is a numerically robust computation of ‘dot(cross(a-d,b-d),c-d)’, which
is the determinant
|a.x a.y a.z 1|
|b.x b.y b.z 1|
|c.x c.y c.z 1|
|d.x d.y d.z 1|
- The result is negative (positive) if 'a', 'b', 'c' appear in
-counterclockwise (clockwise) order when viewed from 'd' or zero if all
+ The result is negative (positive) if ‘a’, ‘b’, ‘c’ appear in
+counterclockwise (clockwise) order when viewed from ‘d’ or zero if all
four points are coplanar.
The routine
real insphere(triple a, triple b, triple c, triple d, triple e);
-returns a positive (negative) value if 'e' lies inside (outside) the
-sphere passing through points 'a,b,c,d' oriented so that
-'dot(cross(a-d,b-d),c-d)' is positive, or zero if all five points are
+returns a positive (negative) value if ‘e’ lies inside (outside) the
+sphere passing through points ‘a,b,c,d’ oriented so that
+‘dot(cross(a-d,b-d),c-d)’ is positive, or zero if all five points are
cospherical. The value returned is the determinant
|a.x a.y a.z a.x^2+a.y^2+a.z^2 1|
|b.x b.y b.z b.x^2+b.y^2+b.z^2 1|
@@ -7451,55 +7509,55 @@ yaxis3(Label(XY()*"$y$",align=-3X),red,above=true);
[./join3]
Three-dimensional versions of bars or arrows can be drawn with one of
-the specifiers 'None', 'Blank', 'BeginBar3', 'EndBar3' (or equivalently
-'Bar3'), 'Bars3', 'BeginArrow3', 'MidArrow3', 'EndArrow3' (or
-equivalently 'Arrow3'), 'Arrows3', 'BeginArcArrow3', 'EndArcArrow3' (or
-equivalently 'ArcArrow3'), 'MidArcArrow3', and 'ArcArrows3'.
-Three-dimensional bars accept the optional arguments '(real size=0,
-triple dir=O)'. If 'size=O', the default bar length is used; if
-'dir=O', the bar is drawn perpendicular to the path and the initial
+the specifiers ‘None’, ‘Blank’, ‘BeginBar3’, ‘EndBar3’ (or equivalently
+‘Bar3’), ‘Bars3’, ‘BeginArrow3’, ‘MidArrow3’, ‘EndArrow3’ (or
+equivalently ‘Arrow3’), ‘Arrows3’, ‘BeginArcArrow3’, ‘EndArcArrow3’ (or
+equivalently ‘ArcArrow3’), ‘MidArcArrow3’, and ‘ArcArrows3’.
+Three-dimensional bars accept the optional arguments ‘(real size=0,
+triple dir=O)’. If ‘size=O’, the default bar length is used; if
+‘dir=O’, the bar is drawn perpendicular to the path and the initial
viewing direction. The predefined three-dimensional arrowhead styles
-are 'DefaultHead3', 'HookHead3', 'TeXHead3'. Versions of the
+are ‘DefaultHead3’, ‘HookHead3’, ‘TeXHead3’. Versions of the
two-dimensional arrowheads lifted to three-dimensional space and aligned
-according to the initial viewpoint (or an optionally specified 'normal'
-vector) are also defined: 'DefaultHead2(triple normal=O)',
-'HookHead2(triple normal=O)', 'TeXHead2(triple normal=O)'. These are
-illustrated in the example 'arrows3.asy'.
-
- Module 'three' also defines the three-dimensional margins
-'NoMargin3', 'BeginMargin3', 'EndMargin3', 'Margin3', 'Margins3',
-'BeginPenMargin2', 'EndPenMargin2', 'PenMargin2', 'PenMargins2',
-'BeginPenMargin3', 'EndPenMargin3', 'PenMargin3', 'PenMargins3',
-'BeginDotMargin3', 'EndDotMargin3', 'DotMargin3', 'DotMargins3',
-'Margin3', and 'TrueMargin3'.
+according to the initial viewpoint (or an optionally specified ‘normal’
+vector) are also defined: ‘DefaultHead2(triple normal=O)’,
+‘HookHead2(triple normal=O)’, ‘TeXHead2(triple normal=O)’. These are
+illustrated in the example ‘arrows3.asy’.
+
+ Module ‘three’ also defines the three-dimensional margins
+‘NoMargin3’, ‘BeginMargin3’, ‘EndMargin3’, ‘Margin3’, ‘Margins3’,
+‘BeginPenMargin2’, ‘EndPenMargin2’, ‘PenMargin2’, ‘PenMargins2’,
+‘BeginPenMargin3’, ‘EndPenMargin3’, ‘PenMargin3’, ‘PenMargins3’,
+‘BeginDotMargin3’, ‘EndDotMargin3’, ‘DotMargin3’, ‘DotMargins3’,
+‘Margin3’, and ‘TrueMargin3’.
The routine
void pixel(picture pic=currentpicture, triple v, pen p=currentpen,
real width=1);
-can be used to draw on picture 'pic' a pixel of width 'width' at
-position 'v' using pen 'p'.
+can be used to draw on picture ‘pic’ a pixel of width ‘width’ at
+position ‘v’ using pen ‘p’.
Further three-dimensional examples are provided in the files
-'near_earth.asy', 'conicurv.asy', and (in the 'animations' subdirectory)
-'cube.asy'.
+‘near_earth.asy’, ‘conicurv.asy’, and (in the ‘animations’ subdirectory)
+‘cube.asy’.
Limited support for projected vector graphics (effectively
-three-dimensional nonrendered 'PostScript') is available with the
-setting 'render=0'. This currently only works for piecewise planar
-surfaces, such as those produced by the parametric 'surface' routines in
-the 'graph3' module. Surfaces produced by the 'solids' module will also
-be properly rendered if the parameter 'nslices' is sufficiently large.
+three-dimensional nonrendered ‘PostScript’) is available with the
+setting ‘render=0’. This currently only works for piecewise planar
+surfaces, such as those produced by the parametric ‘surface’ routines in
+the ‘graph3’ module. Surfaces produced by the ‘solids’ module will also
+be properly rendered if the parameter ‘nslices’ is sufficiently large.
- In the module 'bsp', hidden surface removal of planar pictures is
+ In the module ‘bsp’, hidden surface removal of planar pictures is
implemented using a binary space partition and picture clipping. A
-planar path is first converted to a structure 'face' derived from
-'picture'. A 'face' may be given to a two-dimensional drawing routine
-in place of any 'picture' argument. An array of such faces may then be
+planar path is first converted to a structure ‘face’ derived from
+‘picture’. A ‘face’ may be given to a two-dimensional drawing routine
+in place of any ‘picture’ argument. An array of such faces may then be
drawn, removing hidden surfaces:
void add(picture pic=currentpicture, face[] faces,
projection P=currentprojection);
- Labels may be projected to two dimensions, using projection 'P', onto
-the plane passing through point 'O' with normal 'cross(u,v)' by
+ Labels may be projected to two dimensions, using projection ‘P’, onto
+the plane passing through point ‘O’ with normal ‘cross(u,v)’ by
multiplying it on the left by the transform
transform transform(triple u, triple v, triple O=O,
projection P=currentprojection);
@@ -7531,24 +7589,24 @@ add(faces);

File: asymptote.info, Node: obj, Next: graph3, Prev: three, Up: Base modules
-8.29 'obj'
+8.29 ‘obj’
==========
This module allows one to construct surfaces from simple obj files, as
-illustrated in the example files 'galleon.asy' and 'triceratops.asy'.
+illustrated in the example files ‘galleon.asy’ and ‘triceratops.asy’.

File: asymptote.info, Node: graph3, Next: grid3, Prev: obj, Up: Base modules
-8.30 'graph3'
+8.30 ‘graph3’
=============
This module implements three-dimensional versions of the functions in
-'graph.asy'. To draw an x axis in three dimensions, use the routine
+‘graph.asy’. To draw an x axis in three dimensions, use the routine
void xaxis3(picture pic=currentpicture, Label L="", axis axis=YZZero,
real xmin=-infinity, real xmax=infinity, pen p=currentpen,
ticks3 ticks=NoTicks3, arrowbar3 arrow=None, bool above=false);
-Analogous routines 'yaxis' and 'zaxis' can be used to draw y and z axes
+Analogous routines ‘yaxis’ and ‘zaxis’ can be used to draw y and z axes
in three dimensions. There is also a routine for drawing all three
axis:
void axes3(picture pic=currentpicture,
@@ -7566,16 +7624,16 @@ axis YZZero(triple align=O, bool extend=false);
axis XZZero(triple align=O, bool extend=false);
axis XYZero(triple align=O, bool extend=false);
axis Bounds(int type=Both, int type2=Both, triple align=O, bool extend=false);
-The optional 'align' parameter to these routines can be used to specify
-the default axis and tick label alignments. The 'Bounds' axis accepts
-two type parameters, each of which must be one of 'Min', 'Max', or
-'Both'. These parameters specify which of the four possible
+The optional ‘align’ parameter to these routines can be used to specify
+the default axis and tick label alignments. The ‘Bounds’ axis accepts
+two type parameters, each of which must be one of ‘Min’, ‘Max’, or
+‘Both’. These parameters specify which of the four possible
three-dimensional bounding box edges should be drawn.
- The three-dimensional tick options are 'NoTicks3', 'InTicks',
-'OutTicks', and 'InOutTicks'. These specify the tick directions for the
-'Bounds' axis type; other axis types inherit the direction that would be
-used for the 'Bounds(Min,Min)' axis.
+ The three-dimensional tick options are ‘NoTicks3’, ‘InTicks’,
+‘OutTicks’, and ‘InOutTicks’. These specify the tick directions for the
+‘Bounds’ axis type; other axis types inherit the direction that would be
+used for the ‘Bounds(Min,Min)’ axis.
Here is an example of a helix and bounding box axes with ticks and
axis labels, using orthographic projection:
@@ -7636,7 +7694,7 @@ axis(Label("C",position=0,align=15X),g,InTicks(endlabel=false,8,end=false),
[./generalaxis3]
- Surface plots of matrices and functions over the region 'box(a,b)' in
+ Surface plots of matrices and functions over the region ‘box(a,b)’ in
the XY plane are also implemented:
surface surface(real[][] f, pair a, pair b, bool[][] cond={});
surface surface(real[][] f, pair a, pair b, splinetype xsplinetype,
@@ -7659,24 +7717,24 @@ surface surface(triple f(pair z), pair a, pair b, int nu=nmesh, int nv=nu,
splinetype[] usplinetype, splinetype[] vsplinetype=Spline,
bool cond(pair z)=null);
The final two versions draw parametric surfaces for a function f(u,v)
-over the parameter space 'box(a,b)', as illustrated in the example
-'parametricsurface.asy'. An optional splinetype 'Spline' may be
-specified. The boolean array or function 'cond' can be used to control
+over the parameter space ‘box(a,b)’, as illustrated in the example
+‘parametricsurface.asy’. An optional splinetype ‘Spline’ may be
+specified. The boolean array or function ‘cond’ can be used to control
which surface mesh cells are actually drawn (by default all mesh cells
-over 'box(a,b)' are drawn).
+over ‘box(a,b)’ are drawn).
- One can also construct the surface generated by rotating a path 'g'
-between 'angle1' to 'angle2' (in degrees) sampled 'n' times about the
-line 'c--c+axis':
+ One can also construct the surface generated by rotating a path ‘g’
+between ‘angle1’ to ‘angle2’ (in degrees) sampled ‘n’ times about the
+line ‘c--c+axis’:
surface surface(triple c, path3 g, triple axis, int n=nslice,
real angle1=0, real angle2=360, pen color(int i, real j)=null);
-The optional argument 'color(int i, real j)' can be used to override the
-surface color at the point obtained by rotating vertex 'i' by angle 'j'
+The optional argument ‘color(int i, real j)’ can be used to override the
+surface color at the point obtained by rotating vertex ‘i’ by angle ‘j’
(in degrees).
Surface lighting is illustrated in the example files
-'parametricsurface.asy' and 'sinc.asy'. Lighting can be disabled by
-setting 'light=nolight', as in this example of a Gaussian surface:
+‘parametricsurface.asy’ and ‘sinc.asy’. Lighting can be disabled by
+setting ‘light=nolight’, as in this example of a Gaussian surface:
import graph3;
size(200,0);
@@ -7700,27 +7758,27 @@ draw(s,lightgray,meshpen=black+thick(),nolight,render(merge=true));
label("$O$",O,-Z+Y,red);
[./GaussianSurface]
-A mesh can be drawn without surface filling by specifying 'nullpen' for
+A mesh can be drawn without surface filling by specifying ‘nullpen’ for
the surfacepen.
- A vector field of 'nu'\times'nv' arrows on a parametric surface 'f'
-over 'box(a,b)' can be drawn with the routine
+ A vector field of ‘nu’\times‘nv’ arrows on a parametric surface ‘f’
+over ‘box(a,b)’ can be drawn with the routine
picture vectorfield(path3 vector(pair v), triple f(pair z), pair a, pair b,
int nu=nmesh, int nv=nu, bool truesize=false,
real maxlength=truesize ? 0 : maxlength(f,a,b,nu,nv),
bool cond(pair z)=null, pen p=currentpen,
arrowbar3 arrow=Arrow3, margin3 margin=PenMargin3)
- as illustrated in the examples 'vectorfield3.asy' and
-'vectorfieldsphere.asy'.
+ as illustrated in the examples ‘vectorfield3.asy’ and
+‘vectorfieldsphere.asy’.

File: asymptote.info, Node: grid3, Next: solids, Prev: graph3, Up: Base modules
-8.31 'grid3'
+8.31 ‘grid3’
============
This module, contributed by Philippe Ivaldi, can be used for drawing 3D
-grids. Here is an example (further examples can be found in 'grid3.asy'
+grids. Here is an example (further examples can be found in ‘grid3.asy’
and at
<https://web.archive.org/web/20201130113133/http://www.piprime.fr/files/asymptote/grid3/>):
import grid3;
@@ -7746,13 +7804,13 @@ zaxis3(Label("$z$",position=EndPoint,align=(-1,0.5)),Bounds(Min,Min),

File: asymptote.info, Node: solids, Next: tube, Prev: grid3, Up: Base modules
-8.32 'solids'
+8.32 ‘solids’
=============
-This solid geometry module defines a structure 'revolution' that can be
+This solid geometry module defines a structure ‘revolution’ that can be
used to fill and draw surfaces of revolution. The following example
uses it to display the outline of a circular cylinder of radius 1 with
-axis 'O--1.5unit(Y+Z)' with perspective projection:
+axis ‘O--1.5unit(Y+Z)’ with perspective projection:
import solids;
size(0,100);
@@ -7763,9 +7821,9 @@ draw(r,heavygreen);
[./cylinderskeleton]
Further illustrations are provided in the example files
-'cylinder.asy', 'cones.asy', 'hyperboloid.asy', and 'torus.asy'.
+‘cylinder.asy’, ‘cones.asy’, ‘hyperboloid.asy’, and ‘torus.asy’.
- The structure 'skeleton' contains the three-dimensional wireframe
+ The structure ‘skeleton’ contains the three-dimensional wireframe
used to visualize a volume of revolution:
struct skeleton {
struct curve {
@@ -7781,21 +7839,21 @@ struct skeleton {

File: asymptote.info, Node: tube, Next: flowchart, Prev: solids, Up: Base modules
-8.33 'tube'
+8.33 ‘tube’
===========
-This module extends the 'tube' surfaces constructed in
-'three_arrows.asy' to arbitrary cross sections, colors, and spine
+This module extends the ‘tube’ surfaces constructed in
+‘three_arrows.asy’ to arbitrary cross sections, colors, and spine
transformations. The routine
surface tube(path3 g, coloredpath section,
transform T(real)=new transform(real t) {return identity();},
real corner=1, real relstep=0);
-draws a tube along 'g' with cross section 'section', after applying the
-transformation 'T(t)' at 'point(g,t)'. The parameter 'corner' controls
-the number of elementary tubes at the angular points of 'g'. A nonzero
-value of 'relstep' specifies a fixed relative time step (in the sense of
-'relpoint(g,t)') to use in constructing elementary tubes along 'g'. The
-type 'coloredpath' is a generalization of 'path' to which a 'path' can
+draws a tube along ‘g’ with cross section ‘section’, after applying the
+transformation ‘T(t)’ at ‘point(g,t)’. The parameter ‘corner’ controls
+the number of elementary tubes at the angular points of ‘g’. A nonzero
+value of ‘relstep’ specifies a fixed relative time step (in the sense of
+‘relpoint(g,t)’) to use in constructing elementary tubes along ‘g’. The
+type ‘coloredpath’ is a generalization of ‘path’ to which a ‘path’ can
be cast:
struct coloredpath
{
@@ -7803,15 +7861,15 @@ struct coloredpath
pen[] pens(real);
int colortype=coloredSegments;
}
-Here 'p' defines the cross section and the method 'pens(real t)' returns
+Here ‘p’ defines the cross section and the method ‘pens(real t)’ returns
an array of pens (interpreted as a cyclic array) used for shading the
-tube patches at 'relpoint(g,t)'. If 'colortype=coloredSegments', the
+tube patches at ‘relpoint(g,t)’. If ‘colortype=coloredSegments’, the
tube patches are filled as if each segment of the section was colored
-with the pen returned by 'pens(t)', whereas if 'colortype=coloredNodes',
+with the pen returned by ‘pens(t)’, whereas if ‘colortype=coloredNodes’,
the tube components are vertex shaded as if the nodes of the section
were colored.
- A 'coloredpath' can be constructed with one of the routines:
+ A ‘coloredpath’ can be constructed with one of the routines:
coloredpath coloredpath(path p, pen[] pens(real),
int colortype=coloredSegments);
coloredpath coloredpath(path p, pen[] pens=new pen[] {currentpen},
@@ -7821,24 +7879,24 @@ In the second case, the pens are independent of the relative time. In
the third case, the array of pens contains only one pen, which depends
of the relative time.
- The casting of 'path' to 'coloredpath' allows the use of a 'path'
-instead of a 'coloredpath'; in this case the shading behaviour is the
+ The casting of ‘path’ to ‘coloredpath’ allows the use of a ‘path’
+instead of a ‘coloredpath’; in this case the shading behaviour is the
default shading behavior for a surface.
- An example of 'tube' is provided in the file 'trefoilknot.asy'.
+ An example of ‘tube’ is provided in the file ‘trefoilknot.asy’.
Further examples can be found at
<https://web.archive.org/web/20201130113133/http://www.piprime.fr/files/asymptote/tube>.

File: asymptote.info, Node: flowchart, Next: contour, Prev: tube, Up: Base modules
-8.34 'flowchart'
+8.34 ‘flowchart’
================
This module provides routines for drawing flowcharts. The primary
-structure is a 'block', which represents a single block on the
+structure is a ‘block’, which represents a single block on the
flowchart. The following eight functions return a position on the
-appropriate edge of the block, given picture transform 't':
+appropriate edge of the block, given picture transform ‘t’:
pair block.top(transform t=identity());
pair block.left(transform t=identity());
@@ -7853,8 +7911,8 @@ To obtain an arbitrary position along the boundary of the block in user
coordinates, use:
pair block.position(real x, transform t=identity());
-The center of the block in user coordinates is stored in 'block.center'
-and the block size in 'PostScript' coordinates is given by 'block.size'.
+The center of the block in user coordinates is stored in ‘block.center’
+and the block size in ‘PostScript’ coordinates is given by ‘block.size’.
A frame containing the block is returned by
frame block.draw(pen p=currentpen);
@@ -7862,7 +7920,7 @@ frame block.draw(pen p=currentpen);
The following block generation routines accept a Label, string, or
frame for their object argument:
-"rectangular block with an optional header (and padding 'dx' around header and body):"
+“rectangular block with an optional header (and padding ‘dx’ around header and body):”
block rectangle(object header, object body, pair center=(0,0),
pen headerpen=mediumgray, pen bodypen=invisible,
pen drawpen=currentpen,
@@ -7875,45 +7933,45 @@ frame for their object argument:
real dx=3, real minwidth=minblockwidth,
real minheight=minblockheight);
-"parallelogram block:"
+“parallelogram block:”
block parallelogram(object body, pair center=(0,0),
pen fillpen=invisible, pen drawpen=currentpen,
real dx=3, real slope=2,
real minwidth=minblockwidth,
real minheight=minblockheight);
-"diamond-shaped block:"
+“diamond-shaped block:”
block diamond(object body, pair center=(0,0),
pen fillpen=invisible, pen drawpen=currentpen,
real ds=5, real dw=1,
real height=20, real minwidth=minblockwidth,
real minheight=minblockheight);
-"circular block:"
+“circular block:”
block circle(object body, pair center=(0,0), pen fillpen=invisible,
pen drawpen=currentpen, real dr=3,
real mindiameter=mincirclediameter);
-"rectangular block with rounded corners:"
+“rectangular block with rounded corners:”
block roundrectangle(object body, pair center=(0,0),
pen fillpen=invisible, pen drawpen=currentpen,
real ds=5, real dw=0, real minwidth=minblockwidth,
real minheight=minblockheight);
-"rectangular block with beveled edges:"
+“rectangular block with beveled edges:”
block bevel(object body, pair center=(0,0), pen fillpen=invisible,
pen drawpen=currentpen, real dh=5, real dw=5,
real minwidth=minblockwidth, real minheight=minblockheight);
- To draw paths joining the pairs in 'point' with right-angled lines,
+ To draw paths joining the pairs in ‘point’ with right-angled lines,
use the routine:
path path(pair point[] ... flowdir dir[]);
-The entries in 'dir' identify whether successive segments between the
-pairs specified by 'point' should be drawn in the 'Horizontal' or
-'Vertical' direction.
+The entries in ‘dir’ identify whether successive segments between the
+pairs specified by ‘point’ should be drawn in the ‘Horizontal’ or
+‘Vertical’ direction.
Here is a simple flowchart example (see also the example
-'controlsystem.asy'):
+‘controlsystem.asy’):
size(0,300);
@@ -7948,36 +8006,36 @@ add(new void(picture pic, transform t) {

File: asymptote.info, Node: contour, Next: contour3, Prev: flowchart, Up: Base modules
-8.35 'contour'
+8.35 ‘contour’
==============
This module draws contour lines. To construct contours corresponding to
-the values in a real array 'c' for a function 'f' on 'box(a,b)', use the
+the values in a real array ‘c’ for a function ‘f’ on ‘box(a,b)’, use the
routine
guide[][] contour(real f(real, real), pair a, pair b,
real[] c, int nx=ngraph, int ny=nx,
interpolate join=operator --, int subsample=1);
-The integers 'nx' and 'ny' define the resolution. The default
-resolution, 'ngraph x ngraph' (here 'ngraph' defaults to '100') can be
+The integers ‘nx’ and ‘ny’ define the resolution. The default
+resolution, ‘ngraph x ngraph’ (here ‘ngraph’ defaults to ‘100’) can be
increased for greater accuracy. The default interpolation operator is
-'operator --' (linear). Spline interpolation ('operator ..') may
+‘operator --’ (linear). Spline interpolation (‘operator ..’) may
produce smoother contours but it can also lead to overshooting. The
-'subsample' parameter indicates the number of interior points that
-should be used to sample contours within each '1 x 1' box; the default
-value of '1' is usually sufficient.
+‘subsample’ parameter indicates the number of interior points that
+should be used to sample contours within each ‘1 x 1’ box; the default
+value of ‘1’ is usually sufficient.
To construct contours for an array of data values on a uniform
-two-dimensional lattice on 'box(a,b)', use
+two-dimensional lattice on ‘box(a,b)’, use
guide[][] contour(real[][] f, pair a, pair b, real[] c,
interpolate join=operator --, int subsample=1);
To construct contours for an array of data values on a nonoverlapping
-regular mesh specified by the two-dimensional array 'z',
+regular mesh specified by the two-dimensional array ‘z’,
guide[][] contour(pair[][] z, real[][] f, real[] c,
interpolate join=operator --, int subsample=1);
-To construct contours for an array of values 'f' specified at
-irregularly positioned points 'z', use the routine
+To construct contours for an array of values ‘f’ specified at
+irregularly positioned points ‘z’, use the routine
guide[][] contour(pair[] z, real[] f, real[] c, interpolate join=operator --);
The contours themselves can be drawn with one of the routines
void draw(picture pic=currentpicture, Label[] L=new Label[],
@@ -7986,7 +8044,7 @@ void draw(picture pic=currentpicture, Label[] L=new Label[],
void draw(picture pic=currentpicture, Label[] L=new Label[],
guide[][] g, pen[] p);
- The following simple example draws the contour at value '1' for the
+ The following simple example draws the contour at value ‘1’ for the
function z=x^2+y^2, which is a unit circle:
import contour;
size(75);
@@ -7997,7 +8055,7 @@ draw(contour(f,(-1,-1),(1,1),new real[] {1}));
[./onecontour]
The next example draws and labels multiple contours for the function
-z=x^2-y^2 with the resolution '100 x 100', using a dashed pen for
+z=x^2-y^2 with the resolution ‘100 x 100’, using a dashed pen for
negative contours and a solid pen for positive (and zero) contours:
import contour;
@@ -8134,7 +8192,7 @@ draw(contour(points,values,new real[]{0.25,0.5,1},operator ..),blue);
[./irregularcontour]
In the above example, the contours of irregularly spaced data are
-constructed by first creating a triangular mesh from an array 'z' of
+constructed by first creating a triangular mesh from an array ‘z’ of
pairs:
int[][] triangulate(pair[] z);
@@ -8161,39 +8219,39 @@ for(int i=0; i < np; ++i)
[./triangulate]
- The example 'Gouraudcontour.asy' illustrates how to produce color
-density images over such irregular triangular meshes. 'Asymptote' uses
-a robust version of Paul Bourke's Delaunay triangulation algorithm based
+ The example ‘Gouraudcontour.asy’ illustrates how to produce color
+density images over such irregular triangular meshes. ‘Asymptote’ uses
+a robust version of Paul Bourke’s Delaunay triangulation algorithm based
on the public-domain exact arithmetic predicates written by Jonathan
Shewchuk.

File: asymptote.info, Node: contour3, Next: smoothcontour3, Prev: contour, Up: Base modules
-8.36 'contour3'
+8.36 ‘contour3’
===============
This module draws surfaces described as the null space of real-valued
-functions of (x,y,z) or 'real[][][]' matrices. Its usage is illustrated
-in the example file 'magnetic.asy'.
+functions of (x,y,z) or ‘real[][][]’ matrices. Its usage is illustrated
+in the example file ‘magnetic.asy’.

File: asymptote.info, Node: smoothcontour3, Next: slopefield, Prev: contour3, Up: Base modules
-8.37 'smoothcontour3'
+8.37 ‘smoothcontour3’
=====================
This module, written by Charles Staats, draws implicitly defined
surfaces with smooth appearance. The purpose of this module is similar
-to that of 'contour3': given a real-valued function f(x,y,z), construct
+to that of ‘contour3’: given a real-valued function f(x,y,z), construct
the surface described by the equation f(x,y,z) = 0. The
-'smoothcontour3' module generally produces nicer results than
-'contour3', but takes longer to compile. Additionally, the algorithm
+‘smoothcontour3’ module generally produces nicer results than
+‘contour3’, but takes longer to compile. Additionally, the algorithm
assumes that the function and the surface are both smooth; if they are
-not, then 'contour3' may be a better choice.
+not, then ‘contour3’ may be a better choice.
- To construct the null surface of a function 'f(triple)' or
-'ff(real,real,real)' over 'box(a,b)', use the routine
+ To construct the null surface of a function ‘f(triple)’ or
+‘ff(real,real,real)’ over ‘box(a,b)’, use the routine
surface implicitsurface(real f(triple)=null,
real ff(real,real,real)=null,
triple a,
@@ -8205,18 +8263,18 @@ surface implicitsurface(real f(triple)=null,
int keyword nz=n,
int keyword maxdepth=8,
bool usetriangles=true);
-The optional parameter 'overlapedges' attempts to compensate for an
-artifact that can cause the renderer to "see through" the boundary
-between patches. Although it defaults to 'false', it should usually be
-set to 'true'. The example 'genustwo.asy' illustrates the use of this
+The optional parameter ‘overlapedges’ attempts to compensate for an
+artifact that can cause the renderer to “see through” the boundary
+between patches. Although it defaults to ‘false’, it should usually be
+set to ‘true’. The example ‘genustwo.asy’ illustrates the use of this
function. Additional examples, together with a more in-depth
-explanation of the module's usage and pitfalls, are available at
+explanation of the module’s usage and pitfalls, are available at
<https://github.com/charlesstaats/smoothcontour3>.

File: asymptote.info, Node: slopefield, Next: ode, Prev: smoothcontour3, Up: Base modules
-8.38 'slopefield'
+8.38 ‘slopefield’
=================
To draw a slope field for the differential equation dy/dx=f(x,y) (or
@@ -8225,23 +8283,23 @@ picture slopefield(real f(real,real), pair a, pair b,
int nx=nmesh, int ny=nx,
real tickfactor=0.5, pen p=currentpen,
arrowbar arrow=None);
-Here, the points 'a' and 'b' are the lower left and upper right corners
-of the rectangle in which the slope field is to be drawn, 'nx' and 'ny'
+Here, the points ‘a’ and ‘b’ are the lower left and upper right corners
+of the rectangle in which the slope field is to be drawn, ‘nx’ and ‘ny’
are the respective number of ticks in the x and y directions,
-'tickfactor' is the fraction of the minimum cell dimension to use for
-drawing ticks, and 'p' is the pen to use for drawing the slope fields.
-The return value is a picture that can be added to 'currentpicture' via
-the 'add(picture)' command.
+‘tickfactor’ is the fraction of the minimum cell dimension to use for
+drawing ticks, and ‘p’ is the pen to use for drawing the slope fields.
+The return value is a picture that can be added to ‘currentpicture’ via
+the ‘add(picture)’ command.
The function
path curve(pair c, real f(real,real), pair a, pair b);
-takes a point ('c') and a slope field-defining function 'f' and returns,
-as a path, the curve passing through that point. The points 'a' and 'b'
+takes a point (‘c’) and a slope field-defining function ‘f’ and returns,
+as a path, the curve passing through that point. The points ‘a’ and ‘b’
represent the rectangular boundaries over which the curve is
interpolated.
- Both 'slopefield' and 'curve' alternatively accept a function 'real
-f(real)' that depends on x only, as seen in this example:
+ Both ‘slopefield’ and ‘curve’ alternatively accept a function ‘real
+f(real)’ that depends on x only, as seen in this example:
import slopefield;
@@ -8256,10 +8314,10 @@ draw(curve((0,0),func,(-3,-3),(3,3)),red);

File: asymptote.info, Node: ode, Prev: slopefield, Up: Base modules
-8.39 'ode'
+8.39 ‘ode’
==========
-The 'ode' module, illustrated in the example 'odetest.asy', implements a
+The ‘ode’ module, illustrated in the example ‘odetest.asy’, implements a
number of explicit numerical integration schemes for ordinary
differential equations.
@@ -8269,8 +8327,8 @@ File: asymptote.info, Node: Options, Next: Interactive mode, Prev: Base modul
9 Command-line options
**********************
-Type 'asy -h' to see the full list of command-line options supported by
-'Asymptote':
+Type ‘asy -h’ to see the full list of command-line options supported by
+‘Asymptote’:
Usage: ../asy [options] [file ...]
Options (negate boolean options by replacing - with -no):
@@ -8352,7 +8410,7 @@ Options (negate boolean options by replacing - with -no):
-offline Produce offline html files [false]
-O,-offset pair PostScript offset [(0,0)]
-f,-outformat format Convert each output file to specified format
--o,-outname name Alternative output directory/filename
+-o,-outname name Alternative output directory/file prefix
-outpipe n Output pipe [-1]
-paperheight bp Default page height [0]
-paperwidth bp Default page width [0]
@@ -8388,6 +8446,7 @@ Options (negate boolean options by replacing - with -no):
-twice Run LaTeX twice (to resolve references) [false]
-twosided Use two-sided 3D lighting model for rendering [true]
-u,-user str General purpose user string
+-v3d Embed 3D V3D graphics in PDF output [false]
-v,-verbose Increase verbosity level (can specify multiple times) 0
-version Show version; command-line only
-vibrateTime ms WebGL shift mode vibrate duration [25]
@@ -8396,7 +8455,7 @@ Options (negate boolean options by replacing - with -no):
-warn str Enable warning; command-line only
-webgl2 Use webgl2 if available [false]
-where Show where listed variables are declared [false]
--wsl Run asy under the Windows Subsystem for Linux. [false]
+-wsl Run asy under the Windows Subsystem for Linux [false]
-xasy Interactive mode for xasy [false]
-zoomPinchCap limit WebGL maximum zoom pinch [100]
-zoomPinchFactor n WebGL zoom pinch sensitivity [10]
@@ -8404,30 +8463,30 @@ Options (negate boolean options by replacing - with -no):
-zoomstep step Mouse motion zoom step [0.1]
- All boolean options can be negated by prepending 'no' to the option
+ All boolean options can be negated by prepending ‘no’ to the option
name.
- If no arguments are given, 'Asymptote' runs in interactive mode
+ If no arguments are given, ‘Asymptote’ runs in interactive mode
(*note Interactive mode::). In this case, the default output file is
-'out.eps'.
+‘out.eps’.
- If '-' is given as the file argument, 'Asymptote' reads from standard
+ If ‘-’ is given as the file argument, ‘Asymptote’ reads from standard
input.
If multiple files are specified, they are treated as separate
-'Asymptote' runs.
+‘Asymptote’ runs.
- If the string 'autoimport' is nonempty, a module with this name is
+ If the string ‘autoimport’ is nonempty, a module with this name is
automatically imported for each run as the final step in loading module
-'plain'.
+‘plain’.
- Default option values may be entered as 'Asymptote' code in a
-configuration file named 'config.asy' (or the file specified by the
-environment variable 'ASYMPTOTE_CONFIG' or '-config' option).
-'Asymptote' will look for this file in its usual search path (*note
+ Default option values may be entered as ‘Asymptote’ code in a
+configuration file named ‘config.asy’ (or the file specified by the
+environment variable ‘ASYMPTOTE_CONFIG’ or ‘-config’ option).
+‘Asymptote’ will look for this file in its usual search path (*note
Search paths::). Typically the configuration file is placed in the
-'.asy' directory in the user's home directory ('%USERPROFILE%\.asy'
-under 'MSDOS'). Configuration variables are accessed using the long
+‘.asy’ directory in the user’s home directory (‘%USERPROFILE%\.asy’
+under ‘MSDOS’). Configuration variables are accessed using the long
form of the option names:
import settings;
outformat="pdf";
@@ -8437,94 +8496,94 @@ batchMask=false;
interactiveMask=true;
Command-line options override these defaults. Most configuration
variables may also be changed at runtime. The advanced configuration
-variables 'dvipsOptions', 'hyperrefOptions', 'convertOptions',
-'gsOptions', 'htmlviewerOptions', 'psviewerOptions', 'pdfviewerOptions',
-'pdfreloadOptions', 'glOptions', and 'dvisvgmOptions' allow specialized
+variables ‘dvipsOptions’, ‘hyperrefOptions’, ‘convertOptions’,
+‘gsOptions’, ‘htmlviewerOptions’, ‘psviewerOptions’, ‘pdfviewerOptions’,
+‘pdfreloadOptions’, ‘glOptions’, and ‘dvisvgmOptions’ allow specialized
options to be passed as a string to the respective applications or
-libraries. The default value of 'hyperrefOptions' is
-'setpagesize=false,unicode,pdfborder=0 0 0'.
+libraries. The default value of ‘hyperrefOptions’ is
+‘setpagesize=false,unicode,pdfborder=0 0 0’.
If you insert
import plain;
settings.autoplain=true;
at the beginning of the configuration file, it can contain arbitrary
-'Asymptote' code.
+‘Asymptote’ code.
- The default output format is EPS for the (default) 'latex' and 'tex'
-tex engine and PDF for the 'pdflatex', 'xelatex', 'context', 'luatex',
-and 'lualatex' tex engines. Alternative output formats may be produced
-using the '-f' option (or 'outformat' setting).
+ The default output format is EPS for the (default) ‘latex’ and ‘tex’
+tex engine and PDF for the ‘pdflatex’, ‘xelatex’, ‘context’, ‘luatex’,
+and ‘lualatex’ tex engines. Alternative output formats may be produced
+using the ‘-f’ option (or ‘outformat’ setting).
- To produce SVG output, you will need 'dvisvgm' (version 2.6.3 or
+ To produce SVG output, you will need ‘dvisvgm’ (version 2.6.3 or
later) from <https://dvisvgm.de>. You might need to adjust the
-configuration variable 'libgs' to point to the location of your
-'Ghostscript' library 'libgs.so' (or to an empty string, depending on
-how 'dvisvgm' was configured). The 2.13.1 version (or later) of
-'dvisvgm' can display SVG output (used by the 'xasy' editor) for
-embedded EPS, PDF, PNG, and JPEG images included with the 'graphic()'
+configuration variable ‘libgs’ to point to the location of your
+‘Ghostscript’ library ‘libgs.so’ (or to an empty string, depending on
+how ‘dvisvgm’ was configured). The 2.13.1 version (or later) of
+‘dvisvgm’ can display SVG output (used by the ‘xasy’ editor) for
+embedded EPS, PDF, PNG, and JPEG images included with the ‘graphic()’
function.
- 'Asymptote' can also produce any output format supported by the
-'ImageMagick' 'convert' program (version 6.3.5 or later recommended; an
-'Invalid Parameter' error message indicates that the 'MSDOS' utility
-'convert' is being used instead of the one that comes with
-'ImageMagick'). The optional setting '-render n' requests an output
-resolution of 'n' pixels per 'bp'. Antialiasing is controlled by the
-parameter 'antialias', which by default specifies a sampling width of 2
-pixels. To give other options to 'convert', use the 'convertOptions'
-setting or call convert manually. This example emulates how 'Asymptote'
-produces antialiased 'tiff' output at one pixel per 'bp':
+ ‘Asymptote’ can also produce any output format supported by the
+‘ImageMagick’ ‘convert’ program (version 6.3.5 or later recommended; an
+‘Invalid Parameter’ error message indicates that the ‘MSDOS’ utility
+‘convert’ is being used instead of the one that comes with
+‘ImageMagick’). The optional setting ‘-render n’ requests an output
+resolution of ‘n’ pixels per ‘bp’. Antialiasing is controlled by the
+parameter ‘antialias’, which by default specifies a sampling width of 2
+pixels. To give other options to ‘convert’, use the ‘convertOptions’
+setting or call convert manually. This example emulates how ‘Asymptote’
+produces antialiased ‘tiff’ output at one pixel per ‘bp’:
asy -o - venn | convert -alpha Off -density 144x144 -geometry 50%x eps:- venn.tiff
- If the option '-nosafe' is given, 'Asymptote' runs in unsafe mode.
-This enables the 'int system(string s)' and 'int system(string[] s)'
+ If the option ‘-nosafe’ is given, ‘Asymptote’ runs in unsafe mode.
+This enables the ‘int system(string s)’ and ‘int system(string[] s)’
calls, allowing one to execute arbitrary shell commands. The default
-mode, '-safe', disables this call.
+mode, ‘-safe’, disables this call.
- A 'PostScript' offset may be specified as a pair (in 'bp' units) with
-the '-O' option:
+ A ‘PostScript’ offset may be specified as a pair (in ‘bp’ units) with
+the ‘-O’ option:
asy -O 0,0 file
-The default offset is zero. The pair 'aligndir' specifies an optional
+The default offset is zero. The pair ‘aligndir’ specifies an optional
direction on the boundary of the page (mapped to the rectangle
[-1,1]\times[-1,1]) to which the picture should be aligned; the default
-value '(0,0)' species center alignment.
+value ‘(0,0)’ species center alignment.
- The '-c' ('command') option may be used to execute arbitrary
-'Asymptote' code on the command line as a string. It is not necessary
-to terminate the string with a semicolon. Multiple '-c' options are
+ The ‘-c’ (‘command’) option may be used to execute arbitrary
+‘Asymptote’ code on the command line as a string. It is not necessary
+to terminate the string with a semicolon. Multiple ‘-c’ options are
executed in the order they are given. For example
asy -c 2+2 -c "sin(1)" -c "size(100); draw(unitsquare)"
produces the output
4
0.841470984807897
-and draws a unitsquare of size '100'.
+and draws a unitsquare of size ‘100’.
- The '-u' ('user') option may be used to specify arbitrary 'Asymptote'
+ The ‘-u’ (‘user’) option may be used to specify arbitrary ‘Asymptote’
settings on the command line as a string. It is not necessary to
-terminate the string with a semicolon. Multiple '-u' options are
-executed in the order they are given. Command-line code like '-u
-x=sqrt(2)' can be executed within a module like this:
+terminate the string with a semicolon. Multiple ‘-u’ options are
+executed in the order they are given. Command-line code like ‘-u
+x=sqrt(2)’ can be executed within a module like this:
real x;
usersetting();
write(x);
- When the '-l' ('listvariables') option is used with file arguments,
+ When the ‘-l’ (‘listvariables’) option is used with file arguments,
only global functions and variables defined in the specified file(s) are
listed.
- Additional debugging output is produced with each additional '-v'
+ Additional debugging output is produced with each additional ‘-v’
option:
-'-v'
+‘-v’
Display top-level module and final output file names.
-'-vv'
- Also display imported and included module names and final 'LaTeX'
- and 'dvips' processing information.
-'-vvv'
- Also output 'LaTeX' bidirectional pipe diagnostics.
-'-vvvv'
+‘-vv’
+ Also display imported and included module names and final ‘LaTeX’
+ and ‘dvips’ processing information.
+‘-vvv’
+ Also output ‘LaTeX’ bidirectional pipe diagnostics.
+‘-vvvv’
Also output knot guide solver diagnostics.
-'-vvvvv'
- Also output 'Asymptote' traceback diagnostics.
+‘-vvvvv’
+ Also output ‘Asymptote’ traceback diagnostics.

File: asymptote.info, Node: Interactive mode, Next: GUI, Prev: Options, Up: Top
@@ -8532,22 +8591,22 @@ File: asymptote.info, Node: Interactive mode, Next: GUI, Prev: Options, Up:
10 Interactive mode
*******************
-Interactive mode is entered by executing the command 'asy' with no file
-arguments. When the '-multiline' option is disabled (the default), each
-line must be a complete 'Asymptote' statement (unless explicitly
-continued by a final backslash character '\'); it is not necessary to
+Interactive mode is entered by executing the command ‘asy’ with no file
+arguments. When the ‘-multiline’ option is disabled (the default), each
+line must be a complete ‘Asymptote’ statement (unless explicitly
+continued by a final backslash character ‘\’); it is not necessary to
terminate input lines with a semicolon. If one assigns
-'settings.multiline=true', interactive code can be entered over multiple
+‘settings.multiline=true’, interactive code can be entered over multiple
lines; in this mode, the automatic termination of interactive input
lines by a semicolon is inhibited. Multiline mode is useful for cutting
-and pasting 'Asymptote' code directly into the interactive input buffer.
+and pasting ‘Asymptote’ code directly into the interactive input buffer.
Interactive mode can be conveniently used as a calculator:
expressions entered at the interactive prompt (for which a corresponding
-'write' function exists) are automatically evaluated and written to
-'stdout'. If the expression is non-writable, its type signature will be
+‘write’ function exists) are automatically evaluated and written to
+‘stdout’. If the expression is non-writable, its type signature will be
printed out instead. In either case, the expression can be referred to
-using the symbol '%' in the next line input at the prompt. For example:
+using the symbol ‘%’ in the next line input at the prompt. For example:
> 2+3
5
> %*4
@@ -8561,47 +8620,47 @@ using the symbol '%' in the next line input at the prompt. For example:
> %.size(200,0)
>
- The '%' symbol, when used as a variable, is shorthand for the
-identifier 'operator answer', which is set by the prompt after each
+ The ‘%’ symbol, when used as a variable, is shorthand for the
+identifier ‘operator answer’, which is set by the prompt after each
written expression evaluation.
The following special commands are supported only in interactive mode
and must be entered immediately after the prompt:
-'help'
+‘help’
view the manual;
-'erase'
- erase 'currentpicture';
-'reset'
- reset the 'Asymptote' environment to its initial state, except for
+‘erase’
+ erase ‘currentpicture’;
+‘reset’
+ reset the ‘Asymptote’ environment to its initial state, except for
changes to the settings module (*note settings::), the current
directory (*note cd::), and breakpoints (*note Debugger::);
-'input FILE'
- does an interactive reset, followed by the command 'include FILE'.
- If the file name 'FILE' contains nonalphanumeric characters,
+‘input FILE’
+ does an interactive reset, followed by the command ‘include FILE’.
+ If the file name ‘FILE’ contains nonalphanumeric characters,
enclose it with quotation marks. A trailing semi-colon followed by
- optional 'Asymptote' commands may be entered on the same line.
-'quit'
- exit interactive mode ('exit' is a synonym; the abbreviation 'q' is
- also accepted unless there exists a top-level variable named 'q').
+ optional ‘Asymptote’ commands may be entered on the same line.
+‘quit’
+ exit interactive mode (‘exit’ is a synonym; the abbreviation ‘q’ is
+ also accepted unless there exists a top-level variable named ‘q’).
A history of the most recent 1000 (this number can be changed with
- the 'historylines' configuration variable) previous commands will
- be retained in the file '.asy/history' in the user's home directory
- (unless the command-line option '-localhistory' was specified, in
- which case the history will be stored in the file '.asy_history' in
+ the ‘historylines’ configuration variable) previous commands will
+ be retained in the file ‘.asy/history’ in the user’s home directory
+ (unless the command-line option ‘-localhistory’ was specified, in
+ which case the history will be stored in the file ‘.asy_history’ in
the current directory).
- Typing 'ctrl-C' interrupts the execution of 'Asymptote' code and
+ Typing ‘ctrl-C’ interrupts the execution of ‘Asymptote’ code and
returns control to the interactive prompt.
- Interactive mode is implemented with the GNU 'readline' library, with
+ Interactive mode is implemented with the GNU ‘readline’ library, with
command history and auto-completion. To customize the key bindings,
see: <https://tiswww.case.edu/php/chet/readline/readline.html>
- The file 'asymptote.py' in the 'Asymptote' system directory provides
-an alternative way of entering 'Asymptote' commands interactively,
-coupled with the full power of 'Python'. Copy this file to your 'Python
-path' and then execute from within 'Python 3' the commands
+ The file ‘asymptote.py’ in the ‘Asymptote’ system directory provides
+an alternative way of entering ‘Asymptote’ commands interactively,
+coupled with the full power of ‘Python’. Copy this file to your ‘Python
+path’ and then execute from within ‘Python 3’ the commands
from asymptote import *
g=asy()
g.size(200)
@@ -8619,13 +8678,13 @@ File: asymptote.info, Node: GUI, Next: Command-Line Interface, Prev: Interact
* Menu:
-* GUI installation:: Installing 'xasy'
-* GUI usage:: Using 'xasy' to edit objects
+* GUI installation:: Installing ‘xasy’
+* GUI usage:: Using ‘xasy’ to edit objects
In the event that adjustments to the final figure are required, the
-preliminary Graphical User Interface (GUI) 'xasy' included with
-'Asymptote' allows you to move graphical objects and draw new ones. The
-modified figure can then be saved as a normal 'Asymptote' file.
+preliminary Graphical User Interface (GUI) ‘xasy’ included with
+‘Asymptote’ allows you to move graphical objects and draw new ones. The
+modified figure can then be saved as a normal ‘Asymptote’ file.

File: asymptote.info, Node: GUI installation, Next: GUI usage, Prev: GUI, Up: GUI
@@ -8633,22 +8692,22 @@ File: asymptote.info, Node: GUI installation, Next: GUI usage, Prev: GUI, Up
11.1 GUI installation
=====================
-As 'xasy' is written in the interactive scripting language 'Python/Qt',
-it requires 'Python' (<https://www.python.org>), along with the 'Python'
-packages 'pyqt5', 'cson', and 'numpy':
+As ‘xasy’ is written in the interactive scripting language ‘Python/Qt’,
+it requires ‘Python’ (<https://www.python.org>), along with the ‘Python’
+packages ‘pyqt5’, ‘cson’, and ‘numpy’:
pip3 install cson numpy pyqt5 PyQt5.sip
- Pictures are deconstructed into the SVG image format. Since 'Qt5'
-does not support 'SVG' clipping, you will need the 'rsvg-convert'
-utility, which is part of the 'librsvg2-tools' package on 'UNIX' systems
-and the 'librsvg' package on 'MacOS X'; under 'Microsoft Windows', it is
+ Pictures are deconstructed into the SVG image format. Since ‘Qt5’
+does not support ‘SVG’ clipping, you will need the ‘rsvg-convert’
+utility, which is part of the ‘librsvg2-tools’ package on ‘UNIX’ systems
+and the ‘librsvg’ package on ‘MacOS X’; under ‘Microsoft Windows’, it is
available as
<https://sourceforge.net/projects/tumagcc/files/rsvg-convert-2.40.20.7z>
Deconstruction of a picture into its components is fastest when using
-the 'LaTeX' TeX engine. The default setting 'dvisvgmMultipleFiles=true'
+the ‘LaTeX’ TeX engine. The default setting ‘dvisvgmMultipleFiles=true’
speeds up deconstruction under PDF TeX engines.

@@ -8658,7 +8717,7 @@ File: asymptote.info, Node: GUI usage, Prev: GUI installation, Up: GUI
==============
The arrow keys (or mouse wheel) are convenient for temporarily raising
-and lowering objects within 'xasy', allowing an object to be selected.
+and lowering objects within ‘xasy’, allowing an object to be selected.
Pressing the arrow keys will pan while the shift key is held and zoom
while the control key is held. The mouse wheel will pan while the alt
or shift keys is held and zoom while the control key is held. In
@@ -8681,45 +8740,45 @@ File: asymptote.info, Node: Command-Line Interface, Next: PostScript to Asympt
12 Command-Line Interface
*************************
-'Asymptote' code may be sent to the <http://asymptote.ualberta.ca>
+‘Asymptote’ code may be sent to the <http://asymptote.ualberta.ca>
server directly from the command line, specifying any options directly
in the URL:
- * SVG output:
+ • SVG output:
- 'curl --data-binary 'import venn;'
- 'asymptote.ualberta.ca:10007?f=svg' | display -'
+ ‘curl --data-binary 'import venn;'
+ 'asymptote.ualberta.ca:10007?f=svg' | display -’
- * HTML output:
+ • HTML output:
- 'curl --data-binary
+ ‘curl --data-binary
@/usr/local/share/doc/asymptote/examples/Klein.asy
- 'asymptote.ualberta.ca:10007' -o Klein.html'
+ 'asymptote.ualberta.ca:10007' -o Klein.html’
- * V3D output:
+ • V3D output:
- 'curl --data-binary 'import teapot;'
- 'asymptote.ualberta.ca:10007?f=v3d' -o teapot.v3d'
+ ‘curl --data-binary 'import teapot;'
+ 'asymptote.ualberta.ca:10007?f=v3d' -o teapot.v3d’
- * PDF output with rendered bitmap at 2 pixels per bp:
+ • PDF output with rendered bitmap at 2 pixels per bp:
- 'curl --data-binary 'import teapot;'
- 'asymptote.ualberta.ca:10007?f=pdf' -o teapot.pdf'
+ ‘curl --data-binary 'import teapot;'
+ 'asymptote.ualberta.ca:10007?f=pdf' -o teapot.pdf’
- * PDF output with rendered bitmap at 4 pixels per bp:
+ • PDF output with rendered bitmap at 4 pixels per bp:
- 'curl --data-binary 'import teapot;'
- 'asymptote.ualberta.ca:10007?f=pdf&render=4' -o teapot.pdf'
+ ‘curl --data-binary 'import teapot;'
+ 'asymptote.ualberta.ca:10007?f=pdf&render=4' -o teapot.pdf’
- * PRC output:
+ • PRC output:
- 'curl --data-binary 'import teapot;'
- 'asymptote.ualberta.ca:10007?f=pdf&prc' -o teapot.pdf'
+ ‘curl --data-binary 'import teapot;'
+ 'asymptote.ualberta.ca:10007?f=pdf&prc' -o teapot.pdf’
- * PRC output with rendered preview bitmap at 4 pixels per bp:
+ • PRC output with rendered preview bitmap at 4 pixels per bp:
- 'curl --data-binary 'import teapot;'
- 'asymptote.ualberta.ca:10007?f=pdf&prc&render=4' -o teapot.pdf'
+ ‘curl --data-binary 'import teapot;'
+ 'asymptote.ualberta.ca:10007?f=pdf&prc&render=4' -o teapot.pdf’
The source code for the command-line interface is available at
<https://github.com/vectorgraphics/asymptote-http-server>.
@@ -8730,27 +8789,27 @@ File: asymptote.info, Node: Language server protocol, Next: PostScript to Asym
13 Language server protocol
***************************
-Under 'UNIX' and 'MacOS X', 'Asymptote' supports features of the
+Under ‘UNIX’ and ‘MacOS X’, ‘Asymptote’ supports features of the
Language Server Protocol (LSP)
(https://en.wikipedia.org/wiki/Language_Server_Protocol), including
-function signature and variable matching. Under 'MSWindows',
-'Asymptote' currently supports LSP only when compiled within the
-'Windows Subsystem for Linux'.
+function signature and variable matching. Under ‘MSWindows’,
+‘Asymptote’ currently supports LSP only when compiled within the
+‘Windows Subsystem for Linux’.
- 'Emacs' users can enable the 'Asymptote' language server protocol by
-installing 'lsp-mode' using the following procedure:
+ ‘Emacs’ users can enable the ‘Asymptote’ language server protocol by
+installing ‘lsp-mode’ using the following procedure:
- * Add to the '.emacs' initialization file:
+ • Add to the ‘.emacs’ initialization file:
(require 'package)
(add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/") t)
(package-initialize)
- * Launch emacs and execute
+ • Launch emacs and execute
M-x package-refresh-contents
M-x package-install
- and select 'lsp-mode'.
+ and select ‘lsp-mode’.
- * Add to the '.emacs' initialization file:
+ • Add to the ‘.emacs’ initialization file:
(require 'lsp-mode)
(add-to-list 'lsp-language-id-configuration '(asy-mode . "asymptote"))
@@ -8762,27 +8821,27 @@ installing 'lsp-mode' using the following procedure:
)
)
- * Launch emacs and execute
+ • Launch emacs and execute
M-x lsp

File: asymptote.info, Node: PostScript to Asymptote, Next: Help, Prev: Command-Line Interface, Up: Top
-14 'PostScript' to 'Asymptote'
+14 ‘PostScript’ to ‘Asymptote’
******************************
-The excellent 'PostScript' editor 'pstoedit' (version 3.50 or later;
+The excellent ‘PostScript’ editor ‘pstoedit’ (version 3.50 or later;
available from <https://sourceforge.net/projects/pstoedit/>) includes an
-'Asymptote' backend. Unlike virtually all other 'pstoedit' backends,
-this driver includes native clipping, even-odd fill rule, 'PostScript'
-subpath, and full image support. Here is an example: 'asy -V
-/usr/local/share/doc/asymptote/examples/venn.asy'
+‘Asymptote’ backend. Unlike virtually all other ‘pstoedit’ backends,
+this driver includes native clipping, even-odd fill rule, ‘PostScript’
+subpath, and full image support. Here is an example: ‘asy -V
+/usr/local/share/doc/asymptote/examples/venn.asy’
pstoedit -f asy venn.eps test.asy
asy -V test
-If the line widths aren't quite correct, try giving 'pstoedit' the
-'-dis' option. If the fonts aren't typeset correctly, try giving
-'pstoedit' the '-dt' option.
+If the line widths aren’t quite correct, try giving ‘pstoedit’ the
+‘-dis’ option. If the fonts aren’t typeset correctly, try giving
+‘pstoedit’ the ‘-dt’ option.

File: asymptote.info, Node: Help, Next: Debugger, Prev: PostScript to Asymptote, Up: Top
@@ -8792,30 +8851,30 @@ File: asymptote.info, Node: Help, Next: Debugger, Prev: PostScript to Asympto
A list of frequently asked questions (FAQ) is maintained at
<https://asymptote.sourceforge.io/FAQ>
-Questions on installing and using 'Asymptote' that are not addressed in
-the FAQ should be sent to the 'Asymptote' forum:
+Questions on installing and using ‘Asymptote’ that are not addressed in
+the FAQ should be sent to the ‘Asymptote’ forum:
<https://sourceforge.net/p/asymptote/discussion/409349>
Including an example that illustrates what you are trying to do will
-help you get useful feedback. 'LaTeX' problems can often be diagnosed
-with the '-vv' or '-vvv' command-line options. Contributions in the
-form of patches or 'Asymptote' modules can be posted here:
+help you get useful feedback. ‘LaTeX’ problems can often be diagnosed
+with the ‘-vv’ or ‘-vvv’ command-line options. Contributions in the
+form of patches or ‘Asymptote’ modules can be posted here:
<https://sourceforge.net/p/asymptote/patches>
To receive announcements of upcoming releases, please subscribe to
-'Asymptote' at
+‘Asymptote’ at
<https://sourceforge.net/projects/asymptote/>
-If you find a bug in 'Asymptote', please check (if possible) whether the
-bug is still present in the latest 'git' developmental code (*note
+If you find a bug in ‘Asymptote’, please check (if possible) whether the
+bug is still present in the latest ‘git’ developmental code (*note
Git::) before submitting a bug report. New bugs can be reported at
<https://github.com/vectorgraphics/asymptote/issues>
To see if the bug has already been fixed, check bugs with Status
-'Closed' and recent lines in
+‘Closed’ and recent lines in
<https://asymptote.sourceforge.io/ChangeLog>
- 'Asymptote' can be configured with the optional GNU library
-'libsigsegv', available from <https://www.gnu.org/software/libsigsegv/>,
-which allows one to distinguish user-generated 'Asymptote' stack
+ ‘Asymptote’ can be configured with the optional GNU library
+‘libsigsegv’, available from <https://www.gnu.org/software/libsigsegv/>,
+which allows one to distinguish user-generated ‘Asymptote’ stack
overflows (*note stack overflow::) from true segmentation faults (due to
-internal C++ programming errors; please submit the 'Asymptote' code that
+internal C++ programming errors; please submit the ‘Asymptote’ code that
generates such segmentation faults along with your bug report).

@@ -8826,17 +8885,17 @@ File: asymptote.info, Node: Debugger, Next: Credits, Prev: Help, Up: Top
Asymptote now includes a line-based (as opposed to code-based) debugger
that can assist the user in following flow control. To set a break
-point in file 'file' at line 'line', use the command
+point in file ‘file’ at line ‘line’, use the command
void stop(string file, int line, code s=quote{});
-The optional argument 's' may be used to conditionally set the variable
-'ignore' in 'plain_debugger.asy' to 'true'. For example, the first 10
-instances of this breakpoint will be ignored (the variable 'int count=0'
-is defined in 'plain_debugger.asy'):
+The optional argument ‘s’ may be used to conditionally set the variable
+‘ignore’ in ‘plain_debugger.asy’ to ‘true’. For example, the first 10
+instances of this breakpoint will be ignored (the variable ‘int count=0’
+is defined in ‘plain_debugger.asy’):
stop("test",2,quote{ignore=(++count <= 10);});
- To set a break point in file 'file' at the first line containing the
-string 'text', use
+ To set a break point in file ‘file’ at the first line containing the
+string ‘text’, use
void stop(string file, string text, code s=quote{});
To list all breakpoints, use:
@@ -8848,37 +8907,37 @@ void clear();
The following commands may be entered at the debugging prompt:
-'h'
+‘h’
help;
-'c'
+‘c’
continue execution;
-'i'
+‘i’
step to the next instruction;
-'s'
+‘s’
step to the next executable line;
-'n'
+‘n’
step to the next executable line in the current file;
-'f'
+‘f’
step to the next file;
-'r'
+‘r’
return to the file associated with the most recent breakpoint;
-'t'
- toggle tracing ('-vvvvv') mode;
+‘t’
+ toggle tracing (‘-vvvvv’) mode;
-'q'
+‘q’
quit debugging and end execution;
-'x'
+‘x’
exit the debugger and run to completion.
-Arbitrary 'Asymptote' code may also be entered at the debugging prompt;
-however, since the debugger is implemented with 'eval', currently only
+Arbitrary ‘Asymptote’ code may also be entered at the debugging prompt;
+however, since the debugger is implemented with ‘eval’, currently only
top-level (global) variables can be displayed or modified.
The debugging prompt may be entered manually with the call
@@ -8890,24 +8949,24 @@ File: asymptote.info, Node: Credits, Next: Index, Prev: Debugger, Up: Top
17 Acknowledgments
******************
-Financial support for the development of 'Asymptote' was generously
+Financial support for the development of ‘Asymptote’ was generously
provided by the Natural Sciences and Engineering Research Council of
Canada, the Pacific Institute for Mathematical Sciences, and the
University of Alberta Faculty of Science.
We also would like to acknowledge the previous work of John D. Hobby,
-author of the program 'MetaPost' that inspired the development of
-'Asymptote', and Donald E. Knuth, author of TeX and 'MetaFont' (on which
-'MetaPost' is based).
+author of the program ‘MetaPost’ that inspired the development of
+‘Asymptote’, and Donald E. Knuth, author of TeX and ‘MetaFont’ (on which
+‘MetaPost’ is based).
- The authors of 'Asymptote' are Andy Hammerlindl, John Bowman, and Tom
-Prince. Sean Healy designed the 'Asymptote' logo. Other contributors
+ The authors of ‘Asymptote’ are Andy Hammerlindl, John Bowman, and Tom
+Prince. Sean Healy designed the ‘Asymptote’ logo. Other contributors
include Orest Shardt, Jesse Frohlich, Michail Vidiassov, Charles Staats,
Philippe Ivaldi, Olivier Guibé, Radoslav Marinov, Jeff Samuelson, Chris
Savage, Jacques Pienaar, Mark Henning, Steve Melenchuk, Martin Wiebusch,
-Stefan Knorr, Supakorn "Jamie" Rassameemasmuang, Jacob Skitsko, Joseph
-Chaumont, and Oliver Cheng. Pedram Emami developed the 'Asymptote Web
-Application' hosted at <http://asymptote.ualberta.ca>:
+Stefan Knorr, Supakorn “Jamie” Rassameemasmuang, Jacob Skitsko, Joseph
+Chaumont, and Oliver Cheng. Pedram Emami developed the ‘Asymptote Web
+Application’ hosted at <http://asymptote.ualberta.ca>:
<https://github.com/vectorgraphics/asymptoteWebApplication>
@@ -8959,9 +9018,9 @@ Index
* ---: Bezier curves. (line 84)
* -=: Self & prefix operators.
(line 6)
-* -c: Options. (line 226)
-* -l: Options. (line 245)
-* -u: Options. (line 236)
+* -c: Options. (line 227)
+* -l: Options. (line 246)
+* -u: Options. (line 237)
* -V: Configuring. (line 6)
* -V <1>: Drawing in batch mode.
(line 16)
@@ -8974,7 +9033,7 @@ Index
* 2D graphs: graph. (line 6)
* 3D graphs: graph3. (line 6)
* 3D grids: grid3. (line 6)
-* 3D PostScript: three. (line 655)
+* 3D PostScript: three. (line 665)
* :: Arithmetic & logical.
(line 61)
* ::: Bezier curves. (line 70)
@@ -9014,7 +9073,7 @@ Index
* absolute <1>: three. (line 241)
* accel: Paths and guides. (line 126)
* accel <1>: Paths and guides. (line 132)
-* accel <2>: three. (line 556)
+* accel <2>: three. (line 566)
* access: Import. (line 6)
* access <1>: Import. (line 45)
* acknowledgments: Credits. (line 6)
@@ -9028,8 +9087,8 @@ Index
(line 217)
* add <1>: Frames and pictures.
(line 231)
-* add <2>: three. (line 332)
-* addViews: three. (line 449)
+* add <2>: three. (line 342)
+* addViews: three. (line 459)
* adjust: Pens. (line 123)
* Ai: Mathematical functions.
(line 48)
@@ -9040,7 +9099,7 @@ Index
* alias: Structures. (line 62)
* alias <1>: Arrays. (line 183)
* Align: label. (line 12)
-* aligndir: Options. (line 218)
+* aligndir: Options. (line 219)
* all: Arrays. (line 350)
* Allow: Pens. (line 363)
* and: Bezier curves. (line 56)
@@ -9054,21 +9113,21 @@ Index
* animation <1>: animation. (line 6)
* annotate: annotate. (line 6)
* antialias: three. (line 261)
-* antialias <1>: Options. (line 187)
+* antialias <1>: Options. (line 188)
* append: Files. (line 38)
* append <1>: Arrays. (line 39)
* arc: Paths and guides. (line 24)
* Arc: Paths and guides. (line 37)
-* arc <1>: three. (line 343)
+* arc <1>: three. (line 353)
* ArcArrow: draw. (line 26)
-* ArcArrow3: three. (line 622)
+* ArcArrow3: three. (line 632)
* ArcArrows: draw. (line 26)
-* ArcArrows3: three. (line 622)
+* ArcArrows3: three. (line 632)
* arclength: Paths and guides. (line 153)
-* arclength <1>: three. (line 556)
+* arclength <1>: three. (line 566)
* arcpoint: Paths and guides. (line 163)
* arctime: Paths and guides. (line 157)
-* arctime <1>: three. (line 556)
+* arctime <1>: three. (line 566)
* arguments: Default arguments. (line 6)
* arithmetic operators: Arithmetic & logical.
(line 6)
@@ -9082,10 +9141,10 @@ Index
* arrow keys: Drawing in interactive mode.
(line 11)
* arrow keys <1>: GUI usage. (line 6)
-* Arrow3: three. (line 622)
+* Arrow3: three. (line 632)
* arrows: draw. (line 26)
* Arrows: draw. (line 26)
-* Arrows3: three. (line 622)
+* Arrows3: three. (line 632)
* as: Import. (line 67)
* ascii: Data types. (line 309)
* ascii <1>: Data types. (line 309)
@@ -9104,11 +9163,11 @@ Index
* asy-mode: Editing modes. (line 6)
* asy.vim: Editing modes. (line 32)
* asygl: Configuring. (line 69)
-* asyinclude: LaTeX usage. (line 45)
+* asyinclude: LaTeX usage. (line 42)
* Asymptote Web Application: Description. (line 6)
* asymptote.sty: LaTeX usage. (line 6)
* asymptote.xml: Editing modes. (line 48)
-* ASYMPTOTE_CONFIG: Options. (line 158)
+* ASYMPTOTE_CONFIG: Options. (line 159)
* atan: Mathematical functions.
(line 6)
* aTan: Mathematical functions.
@@ -9120,15 +9179,15 @@ Index
* atleast: Bezier curves. (line 56)
* attach: Frames and pictures.
(line 276)
-* attach <1>: LaTeX usage. (line 50)
-* attach <2>: graph. (line 406)
-* autoadjust: three. (line 418)
-* autoimport: Options. (line 154)
-* automatic scaling: graph. (line 710)
-* automatic scaling <1>: graph. (line 710)
+* attach <1>: LaTeX usage. (line 47)
+* attach <2>: graph. (line 407)
+* autoadjust: three. (line 428)
+* autoimport: Options. (line 155)
+* automatic scaling: graph. (line 711)
+* automatic scaling <1>: graph. (line 711)
* axialshade: fill. (line 43)
-* axis: graph. (line 924)
-* axis <1>: graph. (line 1006)
+* axis: graph. (line 925)
+* axis <1>: graph. (line 1007)
* axis <2>: graph3. (line 66)
* axis <3>: graph3. (line 82)
* azimuth: Data types. (line 154)
@@ -9137,11 +9196,11 @@ Index
* background <1>: three. (line 97)
* background color: Frames and pictures.
(line 180)
-* BackView: three. (line 442)
+* BackView: three. (line 452)
* Bar: draw. (line 19)
-* Bar3: three. (line 622)
+* Bar3: three. (line 632)
* Bars: draw. (line 19)
-* Bars3: three. (line 622)
+* Bars3: three. (line 632)
* barsize: draw. (line 19)
* base modules: Base modules. (line 6)
* basealign: Pens. (line 181)
@@ -9150,18 +9209,18 @@ Index
(line 6)
* beep: Data types. (line 382)
* BeginArcArrow: draw. (line 26)
-* BeginArcArrow3: three. (line 622)
+* BeginArcArrow3: three. (line 632)
* BeginArrow: draw. (line 26)
-* BeginArrow3: three. (line 622)
+* BeginArrow3: three. (line 632)
* BeginBar: draw. (line 19)
-* BeginBar3: three. (line 622)
+* BeginBar3: three. (line 632)
* BeginDotMargin: draw. (line 42)
-* BeginDotMargin3: three. (line 638)
+* BeginDotMargin3: three. (line 648)
* BeginMargin: draw. (line 42)
-* BeginMargin3: three. (line 638)
+* BeginMargin3: three. (line 648)
* BeginPenMargin: draw. (line 42)
-* BeginPenMargin2: three. (line 638)
-* BeginPenMargin3: three. (line 638)
+* BeginPenMargin2: three. (line 648)
+* BeginPenMargin3: three. (line 648)
* BeginPoint: label. (line 55)
* Bessel: Mathematical functions.
(line 48)
@@ -9173,7 +9232,7 @@ Index
* bezulate: three. (line 146)
* Bi: Mathematical functions.
(line 48)
-* Billboard: three. (line 526)
+* Billboard: three. (line 536)
* binary: Files. (line 80)
* binary format: Files. (line 80)
* binary operators: Arithmetic & logical.
@@ -9198,9 +9257,9 @@ Index
* bool3: Data types. (line 25)
* boolean operators: Arithmetic & logical.
(line 6)
-* Bottom: graph. (line 132)
-* BottomTop: graph. (line 138)
-* BottomView: three. (line 442)
+* Bottom: graph. (line 133)
+* BottomTop: graph. (line 139)
+* BottomView: three. (line 452)
* bounding box: Frames and pictures.
(line 180)
* bounds: palette. (line 43)
@@ -9209,15 +9268,15 @@ Index
(line 25)
* box <1>: Frames and pictures.
(line 130)
-* box <2>: three. (line 365)
-* box <3>: three. (line 367)
+* box <2>: three. (line 375)
+* box <3>: three. (line 377)
* bp: Drawing in batch mode.
(line 23)
* brace: Paths and guides. (line 51)
* break: Programming. (line 48)
* breakpoints: Debugger. (line 21)
* brick: Pens. (line 285)
-* broken axis: graph. (line 821)
+* broken axis: graph. (line 822)
* bug reports: Help. (line 19)
* buildcycle: Paths and guides. (line 270)
* Button-1: GUI. (line 6)
@@ -9228,7 +9287,7 @@ Index
* CAD: CAD. (line 6)
* calculateTransform: Frames and pictures.
(line 118)
-* camera: three. (line 412)
+* camera: three. (line 422)
* casts: Casts. (line 6)
* cbrt: Mathematical functions.
(line 6)
@@ -9236,7 +9295,7 @@ Index
* ceil: Mathematical functions.
(line 26)
* Center: label. (line 60)
-* center: three. (line 395)
+* center: three. (line 405)
* checker: Pens. (line 285)
* Chinese: Pens. (line 244)
* choose: Mathematical functions.
@@ -9245,7 +9304,7 @@ Index
(line 48)
* circle: Paths and guides. (line 10)
* Circle: Paths and guides. (line 18)
-* circle <1>: three. (line 339)
+* circle <1>: three. (line 349)
* circle <2>: flowchart. (line 61)
* circlebarframe: markers. (line 18)
* CJK: Pens. (line 244)
@@ -9284,13 +9343,13 @@ Index
* conditional <1>: Arithmetic & logical.
(line 61)
* config: Configuring. (line 69)
-* config <1>: Options. (line 158)
+* config <1>: Options. (line 159)
* configuration file: Configuring. (line 15)
-* configuration file <1>: Options. (line 158)
+* configuration file <1>: Options. (line 159)
* configuring: Configuring. (line 6)
* conj: Data types. (line 62)
* constructors: Structures. (line 91)
-* context: Options. (line 187)
+* context: Options. (line 188)
* continue: Programming. (line 48)
* continue <1>: Debugger. (line 31)
* contour: contour. (line 6)
@@ -9301,8 +9360,8 @@ Index
* convert: Configuring. (line 69)
* convert <1>: Files. (line 159)
* convert <2>: animation. (line 6)
-* convert <3>: Options. (line 187)
-* convertOptions: Options. (line 173)
+* convert <3>: Options. (line 188)
+* convertOptions: Options. (line 174)
* Coons shading: fill. (line 78)
* copy: Arrays. (line 176)
* cos: Mathematical functions.
@@ -9312,11 +9371,11 @@ Index
* cosh: Mathematical functions.
(line 6)
* cputime: Structures. (line 169)
-* crop: graph. (line 639)
-* cropping graphs: graph. (line 639)
+* crop: graph. (line 640)
+* cropping graphs: graph. (line 640)
* cross: Data types. (line 106)
* cross <1>: Data types. (line 197)
-* cross <2>: graph. (line 480)
+* cross <2>: graph. (line 481)
* crossframe: markers. (line 22)
* crosshatch: Pens. (line 302)
* csv: Arrays. (line 382)
@@ -9328,11 +9387,11 @@ Index
* curlSpecifier: Paths and guides. (line 408)
* currentlight: three. (line 76)
* currentpen: Pens. (line 6)
-* currentprojection: three. (line 439)
+* currentprojection: three. (line 449)
* curve: slopefield. (line 20)
-* custom axis types: graph. (line 141)
-* custom mark routine: graph. (line 577)
-* custom tick locations: graph. (line 233)
+* custom axis types: graph. (line 142)
+* custom mark routine: graph. (line 578)
+* custom tick locations: graph. (line 234)
* cut: Paths and guides. (line 251)
* cycle: Figure size. (line 29)
* cycle <1>: Paths. (line 16)
@@ -9340,7 +9399,7 @@ Index
* cyclic: Paths and guides. (line 85)
* cyclic <1>: Paths and guides. (line 376)
* cyclic <2>: Arrays. (line 39)
-* cyclic <3>: three. (line 556)
+* cyclic <3>: three. (line 566)
* Cyrillic: Pens. (line 238)
* dashdotted: Pens. (line 102)
* dashed: Pens. (line 102)
@@ -9352,9 +9411,9 @@ Index
* declaration: Programming. (line 26)
* deconstruct: GUI usage. (line 6)
* default arguments: Default arguments. (line 6)
-* defaultformat: graph. (line 175)
+* defaultformat: graph. (line 176)
* DefaultHead: draw. (line 26)
-* DefaultHead3: three. (line 622)
+* DefaultHead3: three. (line 632)
* defaultpen: Pens. (line 49)
* defaultpen <1>: Pens. (line 122)
* defaultpen <2>: Pens. (line 127)
@@ -9382,7 +9441,7 @@ Index
* dir <1>: Data types. (line 90)
* dir <2>: Data types. (line 181)
* dir <3>: Paths and guides. (line 109)
-* dir <4>: three. (line 556)
+* dir <4>: three. (line 566)
* direction specifier: Bezier curves. (line 6)
* directory: Files. (line 26)
* dirSpecifier: Paths and guides. (line 390)
@@ -9397,11 +9456,11 @@ Index
* dot <3>: Arrays. (line 279)
* dot <4>: Arrays. (line 282)
* DotMargin: draw. (line 42)
-* DotMargin3: three. (line 638)
+* DotMargin3: three. (line 648)
* DotMargins: draw. (line 42)
-* DotMargins3: three. (line 638)
+* DotMargins3: three. (line 648)
* dotted: Pens. (line 102)
-* double deferred drawing: three. (line 317)
+* double deferred drawing: three. (line 327)
* double precision: Files. (line 80)
* draw: Drawing commands. (line 34)
* draw <1>: draw. (line 6)
@@ -9414,11 +9473,11 @@ Index
* drawline: math. (line 9)
* drawtree: drawtree. (line 6)
* dvips: Configuring. (line 69)
-* dvipsOptions: Options. (line 173)
+* dvipsOptions: Options. (line 174)
* dvisvgm: Configuring. (line 69)
-* dvisvgm <1>: Options. (line 192)
+* dvisvgm <1>: Options. (line 193)
* dvisvgmMultipleFiles: GUI installation. (line 20)
-* dvisvgmOptions: Options. (line 173)
+* dvisvgmOptions: Options. (line 174)
* E: Labels. (line 18)
* E <1>: Mathematical functions.
(line 48)
@@ -9433,24 +9492,24 @@ Index
* else: Programming. (line 26)
* emacs: Editing modes. (line 6)
* embed: embed. (line 6)
-* Embedded: three. (line 526)
+* Embedded: three. (line 536)
* emissivepen: three. (line 66)
* empty: Frames and pictures.
(line 7)
* EndArcArrow: draw. (line 26)
-* EndArcArrow3: three. (line 622)
+* EndArcArrow3: three. (line 632)
* EndArrow: draw. (line 26)
-* EndArrow3: three. (line 622)
+* EndArrow3: three. (line 632)
* EndBar: draw. (line 19)
-* EndBar3: three. (line 622)
+* EndBar3: three. (line 632)
* EndDotMargin: draw. (line 42)
-* EndDotMargin3: three. (line 638)
+* EndDotMargin3: three. (line 648)
* endl: Files. (line 65)
* EndMargin: draw. (line 42)
-* EndMargin3: three. (line 638)
+* EndMargin3: three. (line 648)
* EndPenMargin: draw. (line 42)
-* EndPenMargin2: three. (line 638)
-* EndPenMargin3: three. (line 638)
+* EndPenMargin2: three. (line 648)
+* EndPenMargin3: three. (line 648)
* EndPoint: label. (line 55)
* envelope: Frames and pictures.
(line 25)
@@ -9460,7 +9519,7 @@ Index
* eol: Files. (line 97)
* eol <1>: Arrays. (line 364)
* EPS: label. (line 78)
-* EPS <1>: Options. (line 187)
+* EPS <1>: Options. (line 188)
* erase: Drawing in interactive mode.
(line 11)
* erase <1>: Data types. (line 257)
@@ -9474,8 +9533,8 @@ Index
(line 6)
* error: Files. (line 16)
* error <1>: Files. (line 97)
-* error bars: graph. (line 531)
-* errorbars: graph. (line 480)
+* error bars: graph. (line 532)
+* errorbars: graph. (line 481)
* eval: Import. (line 102)
* eval <1>: Import. (line 112)
* evenodd: Paths. (line 37)
@@ -9497,12 +9556,12 @@ Index
* extension: Paths and guides. (line 246)
* extension <1>: MetaPost. (line 10)
* external: embed. (line 11)
-* extrude: three. (line 550)
+* extrude: three. (line 560)
* F: Mathematical functions.
(line 48)
* fabs: Mathematical functions.
(line 6)
-* face: three. (line 662)
+* face: three. (line 672)
* factorial: Mathematical functions.
(line 39)
* Fedora: UNIX binary distributions.
@@ -9533,7 +9592,7 @@ Index
* firstcut: Paths and guides. (line 262)
* fit: Frames and pictures.
(line 113)
-* fit3: three. (line 330)
+* fit3: three. (line 340)
* fixedscaling: Frames and pictures.
(line 81)
* floor: Mathematical functions.
@@ -9551,13 +9610,13 @@ Index
* fontsize: Pens. (line 192)
* for: Programming. (line 26)
* format: Data types. (line 290)
-* format <1>: Options. (line 187)
+* format <1>: Options. (line 188)
* forum: Help. (line 6)
* frame: Frames and pictures.
(line 7)
* freshnel0: three. (line 66)
* from: Import. (line 16)
-* FrontView: three. (line 442)
+* FrontView: three. (line 452)
* function declarations: Functions. (line 79)
* Function shading: fill. (line 100)
* function shading: fill. (line 100)
@@ -9580,7 +9639,7 @@ Index
* globalwrite: Files. (line 40)
* globalwrite <1>: Files. (line 154)
* glOptions: three. (line 261)
-* glOptions <1>: Options. (line 173)
+* glOptions <1>: Options. (line 174)
* GNU Scientific Library: Mathematical functions.
(line 48)
* gouraudshade: fill. (line 63)
@@ -9589,21 +9648,21 @@ Index
* graph: graph. (line 6)
* graph3: graph3. (line 6)
* graphic: label. (line 78)
-* graphic <1>: Options. (line 192)
+* graphic <1>: Options. (line 193)
* graphical user interface: GUI. (line 6)
-* graphwithderiv: graph. (line 670)
+* graphwithderiv: graph. (line 671)
* gray: Pens. (line 25)
* grayscale: Pens. (line 25)
* Grayscale: palette. (line 9)
* grid: Pens. (line 285)
-* grid <1>: graph. (line 766)
+* grid <1>: graph. (line 767)
* grid3: grid3. (line 6)
* gs: Configuring. (line 15)
* GSL: Compiling from UNIX source.
(line 62)
* gsl: Mathematical functions.
(line 48)
-* gsOptions: Options. (line 173)
+* gsOptions: Options. (line 174)
* GUI: GUI. (line 6)
* GUI installation: GUI installation. (line 6)
* GUI usage: GUI usage. (line 6)
@@ -9611,7 +9670,7 @@ Index
* guide3: three. (line 6)
* hatch: Pens. (line 302)
* Headlamp: three. (line 76)
-* height: LaTeX usage. (line 50)
+* height: LaTeX usage. (line 47)
* help: Interactive mode. (line 42)
* help <1>: Help. (line 6)
* help <2>: Debugger. (line 30)
@@ -9621,20 +9680,20 @@ Index
* hex <1>: Pens. (line 64)
* hexadecimal: Data types. (line 306)
* hexadecimal <1>: Pens. (line 62)
-* hidden surface removal: three. (line 662)
+* hidden surface removal: three. (line 672)
* histogram: Mathematical functions.
(line 39)
* history: Files. (line 147)
* history <1>: Interactive mode. (line 54)
* historylines: Interactive mode. (line 58)
* HookHead: draw. (line 26)
-* HookHead3: three. (line 622)
+* HookHead3: three. (line 632)
* Horizontal: flowchart. (line 77)
* HTML5: three. (line 233)
* htmlviewer: Configuring. (line 15)
* htmlviewer <1>: Configuring. (line 38)
-* htmlviewerOptions: Options. (line 173)
-* hyperrefOptions: Options. (line 173)
+* htmlviewerOptions: Options. (line 174)
+* hyperrefOptions: Options. (line 174)
* hypot: Mathematical functions.
(line 6)
* I: Mathematical functions.
@@ -9645,7 +9704,7 @@ Index
* identity <1>: Mathematical functions.
(line 6)
* identity <2>: Arrays. (line 321)
-* identity4: three. (line 494)
+* identity4: three. (line 504)
* if: Programming. (line 26)
* IgnoreAspect: Frames and pictures.
(line 63)
@@ -9654,17 +9713,17 @@ Index
* image-based lighting: three. (line 104)
* ImageMagick: Configuring. (line 69)
* ImageMagick <1>: animation. (line 6)
-* ImageMagick <2>: Options. (line 187)
+* ImageMagick <2>: Options. (line 188)
* images: palette. (line 6)
* implicit casts: Casts. (line 6)
* implicit linear solver: MetaPost. (line 10)
* implicit scaling: Implicit scaling. (line 6)
* implicitsurface: smoothcontour3. (line 16)
* import: Import. (line 45)
-* importv3d: three. (line 308)
+* importv3d: three. (line 318)
* inches: Figure size. (line 18)
* incircle: Data types. (line 120)
-* include: Import. (line 134)
+* include: Import. (line 131)
* including images: label. (line 78)
* increasing: math. (line 55)
* inf: Data types. (line 35)
@@ -9672,7 +9731,7 @@ Index
* initialized: Arrays. (line 39)
* initializers: Variable initializers.
(line 6)
-* inline: LaTeX usage. (line 50)
+* inline: LaTeX usage. (line 47)
* InOutTicks: graph3. (line 35)
* input: Files. (line 10)
* input <1>: Files. (line 12)
@@ -9684,7 +9743,7 @@ Index
* inside: Paths and guides. (line 294)
* inside <1>: Paths and guides. (line 299)
* inside <2>: Paths and guides. (line 305)
-* insphere: three. (line 585)
+* insphere: three. (line 595)
* inst: Debugger. (line 35)
* installation: Installation. (line 6)
* int: Data types. (line 30)
@@ -9703,23 +9762,23 @@ Index
* interpolate: interpolate. (line 6)
* intersect: Paths and guides. (line 195)
* intersect <1>: math. (line 13)
-* intersect <2>: three. (line 556)
+* intersect <2>: three. (line 566)
* intersectionpoint: Paths and guides. (line 238)
* intersectionpoint <1>: math. (line 17)
-* intersectionpoint <2>: three. (line 556)
+* intersectionpoint <2>: three. (line 566)
* intersectionpoints: Paths and guides. (line 242)
-* intersectionpoints <1>: three. (line 556)
-* intersectionpoints <2>: three. (line 569)
+* intersectionpoints <1>: three. (line 566)
+* intersectionpoints <2>: three. (line 579)
* intersections: Paths and guides. (line 206)
* intersections <1>: Paths and guides. (line 213)
-* intersections <2>: three. (line 556)
-* intersections <3>: three. (line 562)
+* intersections <2>: three. (line 566)
+* intersections <3>: three. (line 572)
* InTicks: graph3. (line 35)
* intMax: Data types. (line 30)
* intMin: Data types. (line 30)
* inverse: Transforms. (line 16)
* inverse <1>: Arrays. (line 327)
-* invert: three. (line 484)
+* invert: three. (line 494)
* invisible: Pens. (line 43)
* isnan: Data types. (line 35)
* i_scaled: Mathematical functions.
@@ -9737,7 +9796,7 @@ Index
(line 59)
* keepAspect <1>: Frames and pictures.
(line 63)
-* keepAspect <2>: LaTeX usage. (line 50)
+* keepAspect <2>: LaTeX usage. (line 47)
* keyboard bindings:: three. (line 211)
* keys: Arrays. (line 39)
* keyword: Named arguments. (line 37)
@@ -9750,20 +9809,20 @@ Index
* Label: draw. (line 101)
* label <1>: label. (line 6)
* Label <1>: label. (line 14)
-* Label <2>: graph. (line 330)
-* label <2>: three. (line 520)
+* Label <2>: graph. (line 331)
+* label <2>: three. (line 530)
* labelpath: labelpath. (line 6)
* labelpath3: labelpath3. (line 6)
-* labelx: graph. (line 330)
-* labely: graph. (line 330)
+* labelx: graph. (line 331)
+* labely: graph. (line 331)
* Landscape: Frames and pictures.
- (line 104)
+ (line 103)
* language context: Pens. (line 235)
* language server protocol: Language server protocol.
(line 6)
* lastcut: Paths and guides. (line 266)
* lasy-mode: Editing modes. (line 6)
-* latex: Options. (line 187)
+* latex: Options. (line 188)
* LaTeX NFSS fonts: Pens. (line 206)
* LaTeX usage: LaTeX usage. (line 6)
* latexmk: LaTeX usage. (line 30)
@@ -9771,16 +9830,16 @@ Index
* latticeshade: fill. (line 32)
* layer: Drawing commands. (line 16)
* leastsquares: stats. (line 6)
-* leastsquares <1>: graph. (line 947)
-* Left: graph. (line 269)
-* LeftRight: graph. (line 275)
+* leastsquares <1>: graph. (line 948)
+* Left: graph. (line 270)
+* LeftRight: graph. (line 276)
* LeftSide: label. (line 60)
-* LeftTicks: graph. (line 160)
-* LeftTicks <1>: graph. (line 233)
-* LeftView: three. (line 442)
+* LeftTicks: graph. (line 161)
+* LeftTicks <1>: graph. (line 234)
+* LeftView: three. (line 452)
* legend: Drawing commands. (line 34)
* legend <1>: draw. (line 65)
-* legend <2>: graph. (line 424)
+* legend <2>: graph. (line 425)
* Legendre: Mathematical functions.
(line 48)
* length: Data types. (line 65)
@@ -9789,22 +9848,23 @@ Index
* length <3>: Paths and guides. (line 76)
* length <4>: Paths and guides. (line 373)
* length <5>: Arrays. (line 39)
-* length <6>: three. (line 556)
+* length <6>: three. (line 566)
* letter: Configuring. (line 63)
* lexorder: math. (line 63)
* lexorder <1>: math. (line 66)
* libcurl: Import. (line 94)
-* libgs: Options. (line 192)
+* libgs: Options. (line 193)
* libm routines: Mathematical functions.
(line 6)
* libsigsegv: Functions. (line 100)
* libsigsegv <1>: Help. (line 27)
* light: three. (line 76)
-* limits: graph. (line 639)
+* limits: graph. (line 640)
* line: Arrays. (line 364)
* line <1>: Arrays. (line 368)
* line mode: Arrays. (line 364)
-* Linear: graph. (line 710)
+* linear: graph. (line 36)
+* Linear: graph. (line 711)
* linecap: Pens. (line 139)
* linejoin: Pens. (line 149)
* lineskip: Pens. (line 192)
@@ -9813,14 +9873,14 @@ Index
* locale: Data types. (line 316)
* log: Mathematical functions.
(line 6)
-* Log: graph. (line 710)
-* log-log graph: graph. (line 744)
+* Log: graph. (line 711)
+* log-log graph: graph. (line 745)
* log10: Mathematical functions.
(line 6)
* log1p: Mathematical functions.
(line 6)
-* log2 graph: graph. (line 800)
-* logarithmic graph: graph. (line 744)
+* log2 graph: graph. (line 801)
+* logarithmic graph: graph. (line 745)
* logical operators: Arithmetic & logical.
(line 6)
* longdashdotted: Pens. (line 102)
@@ -9829,8 +9889,8 @@ Index
* loop: Programming. (line 26)
* LSP: Language server protocol.
(line 6)
-* lualatex: Options. (line 187)
-* luatex: Options. (line 187)
+* lualatex: Options. (line 188)
+* luatex: Options. (line 188)
* MacOS X binary distributions: MacOS X binary distributions.
(line 6)
* MacOS X configuration: Compiling from UNIX source.
@@ -9841,17 +9901,17 @@ Index
* map <2>: map. (line 6)
* Margin: draw. (line 42)
* Margin <1>: draw. (line 42)
-* Margin3: three. (line 638)
-* Margin3 <1>: three. (line 638)
+* Margin3: three. (line 648)
+* Margin3 <1>: three. (line 648)
* Margins: draw. (line 42)
-* margins: three. (line 323)
-* Margins3: three. (line 638)
-* mark: graph. (line 480)
+* margins: three. (line 333)
+* Margins3: three. (line 648)
+* mark: graph. (line 481)
* markangle: markers. (line 35)
-* marker: graph. (line 480)
+* marker: graph. (line 481)
* markers: markers. (line 6)
-* marknodes: graph. (line 480)
-* markuniform: graph. (line 480)
+* marknodes: graph. (line 481)
+* markuniform: graph. (line 481)
* mask: Data types. (line 35)
* material: three. (line 66)
* math: math. (line 6)
@@ -9862,7 +9922,7 @@ Index
(line 7)
* max <2>: Arrays. (line 230)
* max <3>: Arrays. (line 240)
-* max <4>: three. (line 556)
+* max <4>: three. (line 566)
* maxbound: Data types. (line 134)
* maxbound <1>: Data types. (line 205)
* maxtile: three. (line 261)
@@ -9877,9 +9937,9 @@ Index
* MetaPost whatever: MetaPost. (line 10)
* Microsoft Windows: Microsoft Windows. (line 6)
* MidArcArrow: draw. (line 26)
-* MidArcArrow3: three. (line 622)
+* MidArcArrow3: three. (line 632)
* MidArrow: draw. (line 26)
-* MidArrow3: three. (line 622)
+* MidArrow3: three. (line 632)
* MidPoint: label. (line 55)
* midpoint: Paths and guides. (line 180)
* min: Paths and guides. (line 275)
@@ -9887,7 +9947,7 @@ Index
(line 7)
* min <2>: Arrays. (line 225)
* min <3>: Arrays. (line 235)
-* min <4>: three. (line 556)
+* min <4>: three. (line 566)
* minbound: Data types. (line 131)
* minbound <1>: Data types. (line 202)
* minipage: label. (line 116)
@@ -9931,16 +9991,16 @@ Index
* noglobalread <1>: Files. (line 40)
* nolight: three. (line 76)
* NoMargin: draw. (line 42)
-* NoMargin3: three. (line 638)
+* NoMargin3: three. (line 648)
* None: draw. (line 19)
* None <1>: draw. (line 26)
* none: Files. (line 65)
-* normal: three. (line 542)
-* nosafe: Options. (line 213)
+* normal: three. (line 552)
+* nosafe: Options. (line 214)
* NOT: Arithmetic & logical.
(line 68)
* notaknot: graph. (line 36)
-* NoTicks: graph. (line 160)
+* NoTicks: graph. (line 161)
* NoTicks3: graph3. (line 35)
* null: Structures. (line 6)
* nullpen: label. (line 14)
@@ -9948,19 +10008,19 @@ Index
(line 140)
* nullpen <2>: Frames and pictures.
(line 149)
-* NURBS: three. (line 422)
-* O: three. (line 335)
+* NURBS: three. (line 432)
+* O: three. (line 345)
* obj: obj. (line 6)
-* oblique: three. (line 378)
-* obliqueX: three. (line 385)
-* obliqueY: three. (line 391)
-* obliqueZ: three. (line 378)
+* oblique: three. (line 388)
+* obliqueX: three. (line 395)
+* obliqueY: three. (line 401)
+* obliqueZ: three. (line 388)
* ode: ode. (line 6)
* offset: Pens. (line 123)
-* offset <1>: Options. (line 218)
-* OmitTick: graph. (line 223)
-* OmitTickInterval: graph. (line 223)
-* OmitTickIntervals: graph. (line 223)
+* offset <1>: Options. (line 219)
+* OmitTick: graph. (line 224)
+* OmitTickInterval: graph. (line 224)
+* OmitTickIntervals: graph. (line 224)
* opacity: Pens. (line 254)
* opacity <1>: three. (line 66)
* open: Files. (line 12)
@@ -9981,15 +10041,15 @@ Index
* OR: Arithmetic & logical.
(line 68)
* orient: Data types. (line 108)
-* orient <1>: three. (line 573)
+* orient <1>: three. (line 583)
* orientation: Frames and pictures.
- (line 104)
-* orthographic: three. (line 395)
+ (line 103)
+* orthographic: three. (line 405)
* outformat: three. (line 184)
* outprefix: Frames and pictures.
(line 91)
* output: Files. (line 38)
-* output <1>: Options. (line 187)
+* output <1>: Options. (line 188)
* OutTicks: graph3. (line 35)
* overloading functions: Functions. (line 55)
* overwrite: Pens. (line 360)
@@ -10007,7 +10067,7 @@ Index
* paperwidth: Configuring. (line 63)
* parallelogram: flowchart. (line 47)
* parametric surface: graph3. (line 99)
-* parametrized curve: graph. (line 639)
+* parametrized curve: graph. (line 640)
* partialsum: math. (line 49)
* partialsum <1>: math. (line 52)
* patch-dependent colors: three. (line 119)
@@ -10015,55 +10075,55 @@ Index
* path <1>: Paths and guides. (line 7)
* path <2>: three. (line 42)
* path <3>: flowchart. (line 77)
-* path markers: graph. (line 480)
+* path markers: graph. (line 481)
* path3: three. (line 6)
* path3 <1>: three. (line 42)
* path[]: Paths. (line 23)
* patterns: Pens. (line 271)
* patterns <1>: patterns. (line 6)
* PBR: three. (line 74)
-* PDF: Options. (line 187)
-* pdflatex: Options. (line 187)
-* pdfreloadOptions: Options. (line 173)
+* PDF: Options. (line 188)
+* pdflatex: Options. (line 188)
+* pdfreloadOptions: Options. (line 174)
* pdfviewer: Configuring. (line 15)
-* pdfviewerOptions: Options. (line 173)
+* pdfviewerOptions: Options. (line 174)
* pen: Pens. (line 6)
* PenMargin: draw. (line 42)
-* PenMargin2: three. (line 638)
-* PenMargin3: three. (line 638)
+* PenMargin2: three. (line 648)
+* PenMargin3: three. (line 648)
* PenMargins: draw. (line 42)
-* PenMargins2: three. (line 638)
-* PenMargins3: three. (line 638)
+* PenMargins2: three. (line 648)
+* PenMargins3: three. (line 648)
* periodic: graph. (line 36)
* perl: LaTeX usage. (line 30)
* perpendicular: geometry. (line 6)
-* perspective: three. (line 422)
+* perspective: three. (line 432)
* physically based rendering: three. (line 74)
* picture: Frames and pictures.
(line 39)
* picture alignment: Frames and pictures.
(line 231)
* piecewisestraight: Paths and guides. (line 92)
-* pixel: three. (line 645)
+* pixel: three. (line 655)
* Pl: Mathematical functions.
(line 48)
* plain: plain. (line 6)
* planar: three. (line 128)
-* plane: three. (line 361)
-* planeproject: three. (line 539)
+* plane: three. (line 371)
+* planeproject: three. (line 549)
* point: Paths and guides. (line 95)
* point <1>: Paths and guides. (line 379)
-* point <2>: three. (line 556)
+* point <2>: three. (line 566)
* polar: Data types. (line 149)
-* polargraph: graph. (line 88)
-* polygon: graph. (line 480)
+* polargraph: graph. (line 89)
+* polygon: graph. (line 481)
* pop: Arrays. (line 39)
* Portrait: Frames and pictures.
- (line 104)
+ (line 103)
* position: three. (line 76)
* position <1>: three. (line 184)
* postcontrol: Paths and guides. (line 146)
-* postcontrol <1>: three. (line 556)
+* postcontrol <1>: three. (line 566)
* postfix operators: Self & prefix operators.
(line 19)
* postscript: Frames and pictures.
@@ -10075,7 +10135,7 @@ Index
* prc: three. (line 279)
* precision: Files. (line 97)
* precontrol: Paths and guides. (line 139)
-* precontrol <1>: three. (line 556)
+* precontrol <1>: three. (line 566)
* prefix operators: Self & prefix operators.
(line 6)
* private: Structures. (line 6)
@@ -10083,7 +10143,7 @@ Index
* pstoedit: PostScript to Asymptote.
(line 6)
* psviewer: Configuring. (line 15)
-* psviewerOptions: Options. (line 173)
+* psviewerOptions: Options. (line 174)
* pt: Figure size. (line 18)
* public: Structures. (line 6)
* push: Arrays. (line 39)
@@ -10107,7 +10167,7 @@ Index
* radians: Mathematical functions.
(line 17)
* radius: Paths and guides. (line 135)
-* radius <1>: three. (line 556)
+* radius <1>: three. (line 566)
* Rainbow: palette. (line 12)
* rand: Mathematical functions.
(line 39)
@@ -10137,7 +10197,7 @@ Index
* rename: Files. (line 156)
* render: three. (line 46)
* render <1>: three. (line 184)
-* render <2>: Options. (line 187)
+* render <2>: Options. (line 188)
* replace: Data types. (line 270)
* resetdefaultpen: Pens. (line 387)
* rest arguments: Rest arguments. (line 6)
@@ -10149,7 +10209,7 @@ Index
* reverse <1>: Paths and guides. (line 183)
* reverse <2>: Paths and guides. (line 382)
* reverse <3>: Arrays. (line 145)
-* reverse <4>: three. (line 556)
+* reverse <4>: three. (line 566)
* rewind: Files. (line 97)
* rfind: Data types. (line 247)
* rgb: Pens. (line 30)
@@ -10157,13 +10217,13 @@ Index
* rgb <2>: Pens. (line 62)
* Riemann zeta function: Mathematical functions.
(line 48)
-* Right: graph. (line 272)
+* Right: graph. (line 273)
* RightSide: label. (line 60)
-* RightTicks: graph. (line 160)
-* RightTicks <1>: graph. (line 233)
-* RightView: three. (line 442)
+* RightTicks: graph. (line 161)
+* RightTicks <1>: graph. (line 234)
+* RightView: three. (line 452)
* Rotate: label. (line 36)
-* rotate: three. (line 510)
+* rotate: three. (line 520)
* Rotate(pair z): label. (line 39)
* round: Mathematical functions.
(line 26)
@@ -10176,7 +10236,7 @@ Index
* runtime imports: Import. (line 102)
* Russian: Pens. (line 238)
* S: Labels. (line 18)
-* safe: Options. (line 213)
+* safe: Options. (line 214)
* save: Frames and pictures.
(line 288)
* saveline: Files. (line 139)
@@ -10184,23 +10244,23 @@ Index
* scale: Pens. (line 123)
* scale <1>: Transforms. (line 34)
* scale <2>: Transforms. (line 36)
-* scale <3>: graph. (line 710)
-* Scale <1>: graph. (line 727)
-* scale <4>: three. (line 509)
-* scale3: three. (line 507)
-* scaled graph: graph. (line 690)
+* scale <3>: graph. (line 711)
+* Scale <1>: graph. (line 728)
+* scale <4>: three. (line 519)
+* scale3: three. (line 517)
+* scaled graph: graph. (line 691)
* schur: Arrays. (line 271)
* schur <1>: Arrays. (line 275)
-* scientific graph: graph. (line 387)
+* scientific graph: graph. (line 388)
* scroll: Files. (line 113)
* search: Arrays. (line 166)
* search <1>: Arrays. (line 172)
* search paths: Search paths. (line 6)
* Seascape: Frames and pictures.
(line 110)
-* secondary axis: graph. (line 853)
-* secondaryX: graph. (line 853)
-* secondaryY: graph. (line 853)
+* secondary axis: graph. (line 854)
+* secondaryX: graph. (line 854)
+* secondaryY: graph. (line 854)
* seconds: Data types. (line 330)
* seek: Files. (line 97)
* seekeof: Files. (line 97)
@@ -10210,7 +10270,7 @@ Index
(line 6)
* sequence: Arrays. (line 118)
* settings: Configuring. (line 15)
-* settings <1>: Options. (line 158)
+* settings <1>: Options. (line 159)
* sgn: Mathematical functions.
(line 26)
* shading: fill. (line 32)
@@ -10218,12 +10278,12 @@ Index
* shift: Transforms. (line 26)
* shift <1>: Transforms. (line 28)
* shift <2>: Transforms. (line 46)
-* shift <3>: three. (line 499)
+* shift <3>: three. (line 509)
* shiftless: Transforms. (line 46)
* shininess: three. (line 66)
* shipout: Frames and pictures.
(line 91)
-* showtarget: three. (line 395)
+* showtarget: three. (line 405)
* Si: Mathematical functions.
(line 48)
* signedint: Files. (line 80)
@@ -10243,9 +10303,9 @@ Index
* singlereal <1>: Files. (line 93)
* sinh: Mathematical functions.
(line 6)
-* SixViews: three. (line 457)
-* SixViewsFR: three. (line 457)
-* SixViewsUS: three. (line 457)
+* SixViews: three. (line 467)
+* SixViewsFR: three. (line 467)
+* SixViewsUS: three. (line 467)
* size: Figure size. (line 6)
* size <1>: Paths and guides. (line 81)
* size <2>: Paths and guides. (line 370)
@@ -10253,9 +10313,9 @@ Index
(line 48)
* size <4>: Frames and pictures.
(line 74)
-* size <5>: three. (line 556)
-* size <6>: Options. (line 187)
-* size3: three. (line 320)
+* size <5>: three. (line 566)
+* size <6>: Options. (line 188)
+* size3: three. (line 330)
* Slant: label. (line 42)
* slant: Transforms. (line 38)
* sleep: Data types. (line 376)
@@ -10299,7 +10359,7 @@ Index
* stop: Debugger. (line 10)
* straight: Paths and guides. (line 88)
* Straight: graph. (line 30)
-* straight <1>: three. (line 556)
+* straight <1>: three. (line 566)
* strftime: Data types. (line 321)
* strftime <1>: Data types. (line 346)
* string: Data types. (line 208)
@@ -10311,7 +10371,7 @@ Index
* struct: Structures. (line 6)
* structures: Structures. (line 6)
* subpath: Paths and guides. (line 186)
-* subpath <1>: three. (line 556)
+* subpath <1>: three. (line 566)
* subpictures: Frames and pictures.
(line 113)
* substr: Data types. (line 262)
@@ -10325,9 +10385,9 @@ Index
* surface <3>: three. (line 142)
* surface <4>: graph3. (line 99)
* surface <5>: graph3. (line 128)
-* SVG: Options. (line 192)
+* SVG: Options. (line 193)
* system: Data types. (line 354)
-* system <1>: Options. (line 213)
+* system <1>: Options. (line 214)
* syzygy: syzygy. (line 6)
* tab: Files. (line 65)
* tab completion: Drawing in interactive mode.
@@ -10338,8 +10398,9 @@ Index
(line 20)
* tanh: Mathematical functions.
(line 6)
-* target: three. (line 395)
+* target: three. (line 405)
* tell: Files. (line 97)
+* template: Templated imports. (line 6)
* tension: Bezier curves. (line 56)
* tension <1>: three. (line 6)
* tensionSpecifier: Paths and guides. (line 402)
@@ -10348,32 +10409,32 @@ Index
* tessellation: three. (line 154)
* tex: Frames and pictures.
(line 305)
-* tex <1>: Options. (line 187)
+* tex <1>: Options. (line 188)
* TeX fonts: Pens. (line 213)
* TeX string: Data types. (line 208)
* texcommand: Configuring. (line 69)
* TeXHead: draw. (line 26)
-* TeXHead3: three. (line 622)
+* TeXHead3: three. (line 632)
* texpath: Configuring. (line 69)
* texpath <1>: label. (line 113)
* texpreamble: Frames and pictures.
(line 314)
* texreset: Frames and pictures.
(line 318)
-* textbook graph: graph. (line 360)
+* textbook graph: graph. (line 361)
* tgz: UNIX binary distributions.
(line 6)
* thick: three. (line 166)
* thin: three. (line 166)
* this: Structures. (line 6)
* three: three. (line 6)
-* ThreeViews: three. (line 457)
-* ThreeViewsFR: three. (line 457)
-* ThreeViewsUS: three. (line 457)
-* tick: graph. (line 330)
-* ticks: graph. (line 160)
-* Ticks: graph. (line 160)
-* Ticks <1>: graph. (line 233)
+* ThreeViews: three. (line 467)
+* ThreeViewsFR: three. (line 467)
+* ThreeViewsUS: three. (line 467)
+* tick: graph. (line 331)
+* ticks: graph. (line 161)
+* Ticks: graph. (line 161)
+* Ticks <1>: graph. (line 234)
* tildeframe: markers. (line 24)
* tile: Pens. (line 285)
* tilings: Pens. (line 271)
@@ -10383,13 +10444,13 @@ Index
* time <3>: math. (line 30)
* times: Paths and guides. (line 220)
* times <1>: Paths and guides. (line 224)
-* Top: graph. (line 135)
-* TopView: three. (line 442)
+* Top: graph. (line 136)
+* TopView: three. (line 452)
* trace: Debugger. (line 50)
-* trailingzero: graph. (line 175)
+* trailingzero: graph. (line 176)
* transform: Transforms. (line 6)
-* transform <1>: three. (line 531)
-* transform3: three. (line 494)
+* transform <1>: three. (line 541)
+* transform3: three. (line 504)
* transparency: Pens. (line 254)
* transparent: three. (line 97)
* transpose: Arrays. (line 212)
@@ -10404,7 +10465,7 @@ Index
(line 48)
* triple: Data types. (line 137)
* TrueMargin: draw. (line 42)
-* TrueMargin3: three. (line 638)
+* TrueMargin3: three. (line 648)
* tube: three. (line 166)
* tube <1>: tube. (line 6)
* tutorial: Tutorial. (line 6)
@@ -10425,10 +10486,10 @@ Index
* unit: Data types. (line 83)
* unit <1>: Data types. (line 174)
* unitbox: Paths. (line 44)
-* unitbox <1>: three. (line 367)
+* unitbox <1>: three. (line 377)
* unitcircle: Paths. (line 17)
* unitcircle <1>: Paths. (line 17)
-* unitcircle <2>: three. (line 335)
+* unitcircle <2>: three. (line 345)
* unitrand: Mathematical functions.
(line 39)
* unitsize: Figure size. (line 39)
@@ -10438,10 +10499,10 @@ Index
(line 6)
* unpacking: Rest arguments. (line 39)
* unravel: Import. (line 29)
-* up: three. (line 395)
+* up: three. (line 405)
* update: Files. (line 38)
* UpsideDown: Frames and pictures.
- (line 104)
+ (line 103)
* UpsideDown <1>: Frames and pictures.
(line 111)
* URL: Import. (line 94)
@@ -10458,8 +10519,8 @@ Index
(line 55)
* variable initializers: Variable initializers.
(line 6)
-* vectorfield: graph. (line 1022)
-* vectorfield <1>: graph. (line 1061)
+* vectorfield: graph. (line 1023)
+* vectorfield <1>: graph. (line 1062)
* vectorfield3: graph3. (line 167)
* vectorization: Arrays. (line 343)
* verbatim: Frames and pictures.
@@ -10467,10 +10528,10 @@ Index
* vertex-dependent colors: three. (line 119)
* Vertical: flowchart. (line 77)
* Viewport: three. (line 76)
-* viewportheight: LaTeX usage. (line 50)
-* viewportmargin: three. (line 323)
-* viewportsize: three. (line 323)
-* viewportwidth: LaTeX usage. (line 50)
+* viewportheight: LaTeX usage. (line 47)
+* viewportmargin: three. (line 333)
+* viewportsize: three. (line 333)
+* viewportwidth: LaTeX usage. (line 47)
* views: three. (line 279)
* vim: Editing modes. (line 32)
* virtual functions: Structures. (line 182)
@@ -10483,53 +10544,53 @@ Index
* while: Programming. (line 48)
* White: three. (line 76)
* white-space string delimiter mode: Arrays. (line 374)
-* width: LaTeX usage. (line 50)
+* width: LaTeX usage. (line 47)
* windingnumber: Paths and guides. (line 283)
* word: Arrays. (line 374)
* write: Files. (line 57)
* write <1>: Arrays. (line 413)
-* X: three. (line 335)
+* X: three. (line 345)
* xasy: GUI. (line 6)
* xaxis3: graph3. (line 7)
* xdr: Files. (line 80)
-* xelatex: Options. (line 187)
-* XEquals: graph. (line 265)
-* xequals: graph. (line 278)
-* xlimits: graph. (line 639)
+* xelatex: Options. (line 188)
+* XEquals: graph. (line 266)
+* xequals: graph. (line 279)
+* xlimits: graph. (line 640)
* XOR: Arithmetic & logical.
(line 68)
* xpart: Data types. (line 94)
* xpart <1>: Data types. (line 185)
* xscale: Transforms. (line 30)
-* xscale3: three. (line 501)
-* xtick: graph. (line 330)
-* XY: three. (line 516)
-* XY <1>: three. (line 531)
+* xscale3: three. (line 511)
+* xtick: graph. (line 331)
+* XY: three. (line 526)
+* XY <1>: three. (line 541)
* XYEquals: graph3. (line 21)
* XYZero: graph3. (line 21)
* XZEquals: graph3. (line 21)
-* XZero: graph. (line 260)
+* XZero: graph. (line 261)
* XZZero: graph3. (line 21)
* Y: Mathematical functions.
(line 6)
* Y <1>: Mathematical functions.
(line 48)
-* Y <2>: three. (line 335)
+* Y <2>: three. (line 345)
* yaxis3: graph3. (line 7)
-* YEquals: graph. (line 128)
-* yequals: graph. (line 278)
-* ylimits: graph. (line 639)
+* YEquals: graph. (line 129)
+* yequals: graph. (line 279)
+* ylimits: graph. (line 640)
* ypart: Data types. (line 97)
* ypart <1>: Data types. (line 188)
* yscale: Transforms. (line 32)
-* yscale3: three. (line 503)
-* ytick: graph. (line 330)
-* YX: three. (line 531)
-* YZ: three. (line 531)
+* yscale3: three. (line 513)
+* ytick: graph. (line 331)
+* YX: three. (line 541)
+* YZ: three. (line 541)
* YZEquals: graph3. (line 21)
-* YZero: graph. (line 123)
+* YZero: graph. (line 124)
* YZZero: graph3. (line 21)
-* Z: three. (line 335)
+* Z: three. (line 345)
* zaxis3: graph3. (line 7)
* zeroTransform: Transforms. (line 44)
* zerowinding: Pens. (line 164)
@@ -10546,161 +10607,162 @@ Index
* zeta: Mathematical functions.
(line 48)
* zpart: Data types. (line 191)
-* zscale3: three. (line 505)
-* ZX: three. (line 531)
-* ZX <1>: three. (line 531)
-* ZY: three. (line 531)
+* zscale3: three. (line 515)
+* ZX: three. (line 541)
+* ZX <1>: three. (line 541)
+* ZY: three. (line 541)

Tag Table:
-Node: Top570
-Node: Description7317
-Node: Installation11564
-Node: UNIX binary distributions12610
-Node: MacOS X binary distributions13733
-Node: Microsoft Windows14321
-Node: Configuring15518
-Node: Search paths19737
-Node: Compiling from UNIX source20745
-Node: Editing modes23896
-Node: Git26334
-Node: Uninstall26841
-Node: Tutorial27187
-Node: Drawing in batch mode28034
-Node: Drawing in interactive mode28910
-Node: Figure size29942
-Node: Labels31537
-Node: Paths32365
-Ref: unitcircle32981
-Node: Drawing commands34922
-Node: draw36730
-Ref: arrows37912
-Node: fill43427
-Ref: gradient shading44473
-Node: clip49087
-Node: label49836
-Ref: Label50436
-Node: Bezier curves56293
-Node: Programming60193
-Ref: array iteration61946
-Node: Data types62113
-Ref: format72881
-Node: Paths and guides77327
-Ref: circle77581
-Ref: extension87281
-Node: Pens94091
-Ref: fillrule101782
-Ref: basealign102686
-Ref: transparency106368
-Ref: makepen109962
-Ref: overwrite110846
-Node: Transforms112060
-Node: Frames and pictures113999
-Ref: envelope115157
-Ref: size116250
-Ref: unitsize117237
-Ref: shipout118310
-Ref: filltype120661
-Ref: add124074
-Ref: add about125016
-Ref: tex128046
-Node: Files128941
-Ref: cd129998
-Ref: scroll134900
-Node: Variable initializers137818
-Node: Structures140535
-Node: Operators148112
-Node: Arithmetic & logical148426
-Node: Self & prefix operators150796
-Node: User-defined operators151590
-Node: Implicit scaling152503
-Node: Functions153066
-Ref: stack overflow156183
-Node: Default arguments156465
-Node: Named arguments157221
-Node: Rest arguments159791
-Node: Mathematical functions162912
-Node: Arrays167569
-Ref: sort175008
-Ref: tridiagonal178246
-Ref: solve179477
-Node: Slices183617
-Node: Casts187525
-Node: Import189795
-Node: Static195365
-Node: LaTeX usage198251
-Node: Base modules204767
-Node: plain207244
-Node: simplex207918
-Node: math208191
-Node: interpolate210858
-Node: geometry211137
-Node: trembling211817
-Node: stats212086
-Node: patterns212345
-Node: markers212580
-Node: map214438
-Node: tree214862
-Node: binarytree215042
-Node: drawtree215709
-Node: syzygy215910
-Node: feynman216184
-Node: roundedpath216458
-Node: animation216740
-Ref: animate217161
-Node: embed218273
-Node: slide219227
-Node: MetaPost219558
-Node: babel220274
-Node: labelpath220506
-Node: labelpath3221326
-Node: annotate221637
-Node: CAD222107
-Node: graph222417
-Ref: ticks229576
-Ref: pathmarkers243298
-Ref: marker243768
-Ref: markuniform244122
-Ref: errorbars245981
-Ref: automatic scaling251110
-Node: palette262806
-Ref: images262924
-Ref: image267220
-Ref: logimage267741
-Ref: penimage268847
-Ref: penfunctionimage269110
-Node: three269882
-Ref: PostScript3D300157
-Node: obj301895
-Node: graph3302144
-Ref: GaussianSurface307887
-Node: grid3309037
-Node: solids309865
-Node: tube310857
-Node: flowchart313129
-Node: contour317772
-Node: contour3324280
-Node: smoothcontour3324592
-Node: slopefield326311
-Node: ode327792
-Node: Options328049
-Ref: configuration file336368
-Ref: settings336368
-Ref: texengines337632
-Ref: convert337632
-Node: Interactive mode341077
-Ref: history343226
-Node: GUI344529
-Node: GUI installation345079
-Node: GUI usage346007
-Node: Command-Line Interface347070
-Node: Language server protocol348512
-Node: PostScript to Asymptote349937
-Node: Help350715
-Node: Debugger352389
-Node: Credits354145
-Node: Index355370
+Node: Top575
+Node: Description7476
+Node: Installation11883
+Node: UNIX binary distributions12969
+Node: MacOS X binary distributions14146
+Node: Microsoft Windows14758
+Node: Configuring15999
+Node: Search paths20514
+Node: Compiling from UNIX source21608
+Node: Editing modes24913
+Node: Git27493
+Node: Uninstall28016
+Node: Tutorial28370
+Node: Drawing in batch mode29241
+Node: Drawing in interactive mode30165
+Node: Figure size31235
+Node: Labels32922
+Node: Paths33814
+Ref: unitcircle34454
+Node: Drawing commands36447
+Node: draw38317
+Ref: arrows39583
+Node: fill45454
+Ref: gradient shading46536
+Node: clip51382
+Node: label52159
+Ref: Label52807
+Node: Bezier curves58904
+Node: Programming62874
+Ref: array iteration64655
+Node: Data types64822
+Ref: format76484
+Node: Paths and guides81156
+Ref: circle81418
+Ref: extension91770
+Node: Pens98944
+Ref: fillrule107085
+Ref: basealign108043
+Ref: transparency111833
+Ref: makepen115557
+Ref: overwrite116463
+Node: Transforms117723
+Node: Frames and pictures119820
+Ref: envelope121038
+Ref: size122155
+Ref: unitsize123222
+Ref: shipout124351
+Ref: filltype126737
+Ref: add130366
+Ref: add about131364
+Ref: tex134482
+Node: Files135393
+Ref: cd136486
+Ref: scroll141634
+Node: Variable initializers144744
+Node: Structures147625
+Node: Operators155476
+Node: Arithmetic & logical155790
+Node: Self & prefix operators158344
+Node: User-defined operators159202
+Node: Implicit scaling160139
+Node: Functions160702
+Ref: stack overflow163847
+Node: Default arguments164133
+Node: Named arguments164905
+Node: Rest arguments167559
+Node: Mathematical functions170716
+Node: Arrays175877
+Ref: sort183975
+Ref: tridiagonal187533
+Ref: solve188848
+Node: Slices193168
+Node: Casts197188
+Node: Import199602
+Node: Templated imports205246
+Node: Static207337
+Node: LaTeX usage210295
+Node: Base modules216896
+Node: plain219403
+Node: simplex220109
+Node: math220390
+Node: interpolate223323
+Node: geometry223614
+Node: trembling224310
+Node: stats224587
+Node: patterns224858
+Node: markers225101
+Node: map226999
+Node: tree227435
+Node: binarytree227619
+Node: drawtree228294
+Node: syzygy228503
+Node: feynman228785
+Node: roundedpath229071
+Node: animation229361
+Ref: animate229810
+Node: embed230986
+Node: slide231996
+Node: MetaPost232339
+Node: babel233115
+Node: labelpath233363
+Node: labelpath3234227
+Node: annotate234554
+Node: CAD235044
+Node: graph235362
+Ref: ticks242978
+Ref: pathmarkers257166
+Ref: marker257640
+Ref: markuniform258010
+Ref: errorbars259917
+Ref: automatic scaling265094
+Node: palette276916
+Ref: images277038
+Ref: image281502
+Ref: logimage282023
+Ref: penimage283133
+Ref: penfunctionimage283396
+Node: three284172
+Ref: PostScript3D316568
+Node: obj318362
+Node: graph3318623
+Ref: GaussianSurface324494
+Node: grid3325672
+Node: solids326508
+Node: tube327532
+Node: flowchart329916
+Node: contour334635
+Node: contour3341237
+Node: smoothcontour3341561
+Node: slopefield343334
+Node: ode344879
+Node: Options345148
+Ref: configuration file353576
+Ref: settings353576
+Ref: texengines354926
+Ref: convert354926
+Node: Interactive mode358631
+Ref: history360860
+Node: GUI362233
+Node: GUI installation362803
+Node: GUI usage363799
+Node: Command-Line Interface364866
+Node: Language server protocol366354
+Node: PostScript to Asymptote367835
+Node: Help368665
+Node: Debugger370395
+Node: Credits372243
+Node: Index373504

End Tag Table
diff --git a/Build/source/utils/asymptote/env.cc b/Build/source/utils/asymptote/env.cc
index 3b0a59b7a32..55826650ae1 100644
--- a/Build/source/utils/asymptote/env.cc
+++ b/Build/source/utils/asymptote/env.cc
@@ -15,8 +15,8 @@ using namespace types;
namespace trans {
-// Instances of this class are passed to types::ty objects so that they can call
-// back to env when checking casting of subtypes.
+// Instances of this class are passed to types::ty objects so that they can
+// call back to env when checking casting of subtypes.
class envCaster : public caster {
protoenv &e;
symbol name;
@@ -214,4 +214,13 @@ record *env::getModule(symbol id, string filename)
return ge.getModule(id, filename);
}
+record *env::getTemplatedModule(symbol id,
+ string filename,
+ string index,
+ mem::vector<absyntax::namedTyEntry*>* args)
+{
+ return ge.getTemplatedModule(id, filename, index, args);
+}
+
+
}
diff --git a/Build/source/utils/asymptote/env.h b/Build/source/utils/asymptote/env.h
index 0f979026206..301e22b2dd0 100644
--- a/Build/source/utils/asymptote/env.h
+++ b/Build/source/utils/asymptote/env.h
@@ -18,6 +18,10 @@ namespace types {
class record;
}
+namespace absyntax {
+class namedTyEntry;
+}
+
namespace trans {
using sym::symbol;
@@ -28,8 +32,8 @@ using types::record;
class genv;
// Keeps track of the name bindings of variables and types. This is used for
-// the fields of a record, whereas the derived class env is used for unqualified
-// names in translation.
+// the fields of a record, whereas the derived class env is used for
+// unqualified names in translation.
class protoenv {
//protected:
public:
@@ -140,8 +144,9 @@ public:
bool add(symbol src, symbol dest,
protoenv &source, varEntry *qualifier, coder &c)
{
- return te.add(src, dest, source.te, qualifier, c) |
- ve.add(src, dest, source.ve, qualifier, c);
+ bool teAdd=te.add(src, dest, source.te, qualifier, c);
+ bool veAdd=ve.add(src, dest, source.ve, qualifier, c);
+ return teAdd || veAdd;
}
// Add the standard functions for a new type.
@@ -180,6 +185,11 @@ public:
~env();
record *getModule(symbol id, string filename);
+ record *getTemplatedModule(symbol id,
+ string filename,
+ string index,
+ mem::vector<absyntax::namedTyEntry*> *args
+ );
};
} // namespace trans
diff --git a/Build/source/utils/asymptote/errormsg.cc b/Build/source/utils/asymptote/errormsg.cc
index 637f6ae50f1..3870caba282 100644
--- a/Build/source/utils/asymptote/errormsg.cc
+++ b/Build/source/utils/asymptote/errormsg.cc
@@ -66,14 +66,13 @@ void errorstream::message(position pos, const string& s)
void errorstream::compiler(position pos)
{
- message(pos,"compiler: ");
+ message(pos,"Compiler bug; report to https://github.com/vectorgraphics/asymptote/issues:\n");
anyErrors = true;
}
void errorstream::compiler()
{
- message(nullPos,"compiler: ");
- anyErrors = true;
+ compiler(nullPos);
}
void errorstream::runtime(position pos)
diff --git a/Build/source/utils/asymptote/errors b/Build/source/utils/asymptote/errors
index d9b46b6ed9c..1b0570bfbb6 100644
--- a/Build/source/utils/asymptote/errors
+++ b/Build/source/utils/asymptote/errors
@@ -155,3 +155,16 @@ errortest.asy: 452.16: expression is not an array of inferable type
errortest.asy: 457.16: expression is not an array of inferable type
errortest.asy: 463.16: expression is not an array of inferable type
errortest.asy: 470.7: array expression cannot be used as an address
+errortest.asy: 518.29: expected 'as'
+errortest.asy: 519.30: expected 'as'
+errortest.asy: 520.23: expected typename=
+errortest.asy: 521.3: Parametrized imports disallowed to reduce naming conflicts. Try 'access <module>(<type parameters>) as <newname>;'.
+errortest.asy: 524.3: templated module access requires template parameters
+errortest.asy: 525.3: Expected 'typedef import(<types>);'
+errortest.asy: 529.30: too few types passed: got 2, expected 3
+errortest.asy: 529.3: could not load module 'errortestTemplate'
+errortest.asy: 531.47: template argument name does not match module: passed T, expected C
+errortest.asy: 531.3: could not load module 'errortestTemplate'
+errortest.asy: 533.37: template argument name does not match module: passed C, expected B
+errortest.asy: 533.3: could not load module 'errortestTemplate'
+errortestTemplate.asy: 5.1: 'typedef import(<types>)' must precede any other code
diff --git a/Build/source/utils/asymptote/errortest.asy b/Build/source/utils/asymptote/errortest.asy
index 1e313702f48..ac704d35d1b 100644
--- a/Build/source/utils/asymptote/errortest.asy
+++ b/Build/source/utils/asymptote/errortest.asy
@@ -26,12 +26,12 @@
// line 95
x y1;
x y2();
- x y3(int);
+ x y3(int);
int y4(x);
struct m {
x y1;
x y2();
- x y3(int);
+ x y3(int);
int y4(x);
}
}
@@ -264,7 +264,7 @@
int x = 1;
int x = 2;
-
+
struct m {
int f() {
return 1;
@@ -512,3 +512,25 @@
int f(real t, int notkeyword x, int y, string z);
int g(real t, int notkeyword x, int y, string z) { return 7; }
}
+
+// template import errors
+{
+ access somefilename(T=int); // Need to specify new name.
+ access somefilename(T=int) notas somefilename_int; // "as" misspelled
+ access somefilename(int) as somefilename_int; // missing keyword
+ import somefilename(T=int); // Templated import not defined.
+}
+{
+ typedef import(T); // this file isn't accessed as a template
+ import typedef(T); // should be "typedef import"
+}
+{
+ // wrong number of params
+ access errortestTemplate(A=int, B=string) as ett_a;
+ // third param incorrectly named
+ access errortestTemplate(A=int, B=string, T=real) as ett_b;
+ // keywords in wrong order
+ access errortestTemplate(A=int, C=real, B=string) as ett_c;
+ // errortestTemplate.asy has extra "typedef import"
+ access errortestTemplate(A=int, B=string, C=real) as ett_d;
+} \ No newline at end of file
diff --git a/Build/source/utils/asymptote/errortestTemplate.asy b/Build/source/utils/asymptote/errortestTemplate.asy
new file mode 100644
index 00000000000..f160b42282a
--- /dev/null
+++ b/Build/source/utils/asymptote/errortestTemplate.asy
@@ -0,0 +1,5 @@
+// File to be incorrectly imported from errortest.asy.
+typedef import(A, B, C);
+assert(false);
+// typedef import gives an error if not the first line
+typedef import(A, B, C);
diff --git a/Build/source/utils/asymptote/examples/filesurface.asy b/Build/source/utils/asymptote/examples/filesurface.asy
index b895ec803eb..bfa500ebf5c 100644
--- a/Build/source/utils/asymptote/examples/filesurface.asy
+++ b/Build/source/utils/asymptote/examples/filesurface.asy
@@ -6,16 +6,9 @@ size3(200,IgnoreAspect);
file in=input("filesurface.dat").line();
real[] x=in;
real[] y=in;
-
real[][] z=in;
-triple f(pair t) {
- int i=round(t.x);
- int j=round(t.y);
- return (x[i],y[j],z[i][j]);
-}
-
-surface s=surface(f,(0,0),(x.length-1,y.length-1),x.length-1,y.length-1);
+surface s=surface(z,x,y,linear,linear);
real[] level=uniform(min(z)*(1-sqrtEpsilon),max(z)*(1+sqrtEpsilon),4);
s.colors(palette(s.map(new real(triple v) {return find(level >= v.z);}),
diff --git a/Build/source/utils/asymptote/examples/triads.asy b/Build/source/utils/asymptote/examples/triads.asy
index d1923d3241f..6cecc55fa46 100644
--- a/Build/source/utils/asymptote/examples/triads.asy
+++ b/Build/source/utils/asymptote/examples/triads.asy
@@ -51,4 +51,4 @@ spectrum(m,s,l);
shipout("triadkpq");
-currentpicture.erase();
+erase();
diff --git a/Build/source/utils/asymptote/fftw++.h b/Build/source/utils/asymptote/fftw++.h
index 162954623ed..44aed4ae1b8 100644
--- a/Build/source/utils/asymptote/fftw++.h
+++ b/Build/source/utils/asymptote/fftw++.h
@@ -1,5 +1,5 @@
/* Fast Fourier transform C++ header class for the FFTW3 Library
- Copyright (C) 2004-2022
+ Copyright (C) 2004-2024
John C. Bowman, University of Alberta
Malcolm Roberts, University of Strasbourg
@@ -20,7 +20,7 @@
#ifndef __fftwpp_h__
#define __fftwpp_h__ 1
-#define __FFTWPP_H_VERSION__ 2.11
+#define __FFTWPP_H_VERSION__ 3.01
#include <cstdlib>
#include <fstream>
@@ -44,11 +44,6 @@ typedef std::complex<double> Complex;
namespace fftwpp {
-// Obsolete names:
-#define FFTWComplex ComplexAlign
-#define FFTWdouble doubleAlign
-#define FFTWdelete deleteAlign
-
// Return the memory alignment used by FFTW.
// Use of this function requires applying patches/fftw-3.3.8-alignment.patch
// to the FFTW source, recompiling, and reinstalling the FFW library.
@@ -82,10 +77,6 @@ public:
threads=1;
}
}
-
- int get_thread_num0() {
- return threads > 1 ? parallel::get_thread_num() : 0;
- }
};
inline size_t realsize(size_t n, bool inplace)
@@ -527,9 +518,9 @@ struct keyless {
bool operator()(const keytype& a, const keytype& b) const {
return a.nx < b.nx || (a.nx == b.nx &&
(a.M < b.M || (a.M == b.M &&
- (a.threads < b.threads ||
- (a.threads == b.threads &&
- a.inplace < b.inplace)))));
+ (a.threads < b.threads ||
+ (a.threads == b.threads &&
+ a.inplace < b.inplace)))));
}
};
@@ -983,9 +974,9 @@ public:
init((Complex *) in,out,threads,threadtable);
}
- void Normalize(Complex *out) {
- fftw::Normalize<Complex>(nx/2+1,M,ostride,odist,out);
- }
+ void Normalize(Complex *out) {
+ fftw::Normalize<Complex>(nx/2+1,M,ostride,odist,out);
+ }
void fftNormalized(double *in, Complex *out=NULL) {
fftw::fftNormalized<double,Complex>(nx/2+1,M,ostride,odist,in,out);
@@ -1081,9 +1072,9 @@ public:
init(in,(Complex *) out,threads,threadtable);
}
- void Normalize(double *out) {
- fftw::Normalize<double>(nx,M,ostride,odist,out);
- }
+ void Normalize(double *out) {
+ fftw::Normalize<double>(nx,M,ostride,odist,out);
+ }
void fftNormalized(Complex *in, double *out=NULL) {
fftw::fftNormalized<Complex,double>(nx,M,ostride,odist,in,out);
diff --git a/Build/source/utils/asymptote/fileio.cc b/Build/source/utils/asymptote/fileio.cc
index 441a9590ec9..b28269b2b1b 100644
--- a/Build/source/utils/asymptote/fileio.cc
+++ b/Build/source/utils/asymptote/fileio.cc
@@ -75,6 +75,46 @@ void ifile::ignoreComment()
}
}
+void ifile::Read(double& val) {
+ char c;
+ std::string str;
+ bool neg;
+
+ while(isspace(c=stream->peek()))
+ stream->ignore();
+ neg=stream->peek() == '-';
+ // Try parsing the input as a number.
+ if(*stream >> val)
+ return;
+
+ clear();
+
+ switch(stream->peek()) {
+ case 'I': case 'i': // inf
+ case 'N': case 'n': // NaN
+ for(Int i=0; i < 3 && stream->good(); i++)
+ str += stream->get();
+ break;
+ default:
+ stream->setstate(std::ios_base::failbit);
+ return;
+ }
+
+ if(strcasecmp(str.c_str(),"inf") == 0)
+ val=std::numeric_limits < double > ::infinity();
+ else if(strcasecmp(str.c_str(),"nan") == 0)
+ val=std::numeric_limits < double > ::quiet_NaN();
+ else {
+ for(auto it=str.rbegin(); it != str.rend(); ++it)
+ stream->putback(*it);
+ stream->setstate(std::ios_base::failbit);
+ return;
+ }
+
+ if(neg)
+ val=-val;
+}
+
bool ifile::eol()
{
int c;
diff --git a/Build/source/utils/asymptote/fileio.h b/Build/source/utils/asymptote/fileio.h
index 6fcd379ec3f..93f79a44fd2 100644
--- a/Build/source/utils/asymptote/fileio.h
+++ b/Build/source/utils/asymptote/fileio.h
@@ -416,7 +416,7 @@ public:
void Read(bool &val) {string t; readwhite(t); val=(t == "true");}
void Read(Int& val) {*stream >> val;}
- void Read(double& val) {*stream >> val;}
+ void Read(double& val);
void Read(pair& val) {*stream >> val;}
void Read(triple& val) {*stream >> val;}
void Read(char& val) {stream->get(val);}
diff --git a/Build/source/utils/asymptote/fundec.cc b/Build/source/utils/asymptote/fundec.cc
index 2a916238259..997161f8823 100644
--- a/Build/source/utils/asymptote/fundec.cc
+++ b/Build/source/utils/asymptote/fundec.cc
@@ -22,7 +22,9 @@ varinit *Default=new definit(nullPos);
void formal::prettyprint(ostream &out, Int indent)
{
- prettyname(out, keywordOnly ? "formal (keyword only)" : "formal", indent, getPos());
+ prettyname(
+ out, keywordOnly ? "formal (keyword only)" : "formal", indent, getPos()
+ );
base->prettyprint(out, indent+1);
if (start) start->prettyprint(out, indent+1);
@@ -115,6 +117,14 @@ void formals::addOps(coenv &e, record *r)
rest->addOps(e, r);
}
+mem::vector<tySymbolPair> *formals::getFields() {
+ auto *lst = new mem::vector<tySymbolPair>();
+ for (auto frml : fields) {
+ lst->emplace_back(frml->getAbsyntaxType(), frml->getName());
+ }
+ return lst;
+}
+
// Another helper class. Does an assignment, but relying only on the
// destination for the type.
class basicAssignExp : public exp {
@@ -194,7 +204,9 @@ std::pair<std::string, optional<std::string>> formal::fnInfo() const
{
std::string typeName(static_cast<std::string>(*base));
return start != nullptr ?
- std::make_pair(typeName, boost::make_optional(static_cast<std::string>(start->getName()))) :
+ std::make_pair(typeName,
+ make_optional(static_cast<std::string>(start->getName()))
+ ) :
std::make_pair(typeName, nullopt);
}
#endif
@@ -356,7 +368,9 @@ types::ty *fundef::trans(coenv &e) {
void fundef::createSymMap(AsymptoteLsp::SymbolContext* symContext)
{
#ifdef HAVE_LSP
- auto* declCtx(symContext->newContext<AsymptoteLsp::AddDeclContexts>(getPos().LineColumn()));
+ auto* declCtx(symContext->newContext<AsymptoteLsp::AddDeclContexts>(
+ getPos().LineColumn()
+ ));
params->createSymMap(declCtx);
body->createSymMap(declCtx);
#endif
@@ -386,9 +400,11 @@ void fundec::transAsField(coenv &e, record *r)
void fundec::createSymMap(AsymptoteLsp::SymbolContext* symContext)
{
#ifdef HAVE_LSP
- AsymptoteLsp::FunctionInfo& fnInfo=symContext->symMap.addFunDef(static_cast<std::string>(id),
- getPos().LineColumn(),
- static_cast<std::string>(*fun.result));
+ AsymptoteLsp::FunctionInfo& fnInfo=
+ symContext->symMap.addFunDef(static_cast<std::string>(id),
+ getPos().LineColumn(),
+ static_cast<std::string>(*fun.result)
+ );
fun.addArgumentsToFnInfo(fnInfo);
fun.createSymMap(symContext);
#endif
diff --git a/Build/source/utils/asymptote/fundec.h b/Build/source/utils/asymptote/fundec.h
index 5d715fd59b0..bfd10f33d38 100644
--- a/Build/source/utils/asymptote/fundec.h
+++ b/Build/source/utils/asymptote/fundec.h
@@ -38,6 +38,8 @@ public:
types::ty *getType(coenv &e, bool tacit=false);
+ absyntax::ty *getAbsyntaxType() { return base; }
+
virtual void addOps(coenv &e, record *r);
varinit *getDefaultValue() {
@@ -60,6 +62,12 @@ public:
std::pair<std::string, optional<std::string>> fnInfo() const;
};
+struct tySymbolPair : public gc {
+ absyntax::ty* ty;
+ symbol sym;
+ tySymbolPair(absyntax::ty* ty, symbol sym) : ty(ty), sym(sym) {}
+};
+
class formals : public absyn {
//friend class funheader;
@@ -119,6 +127,8 @@ public:
types::function *getType(types::ty *result, coenv &e,
bool encodeDefVal = false,
bool tacit = false);
+
+ mem::vector<tySymbolPair> *getFields();
virtual void addOps(coenv &e, record *r);
diff --git a/Build/source/utils/asymptote/gc-8.2.0.tar.gz b/Build/source/utils/asymptote/gc-8.2.0.tar.gz
deleted file mode 100644
index 3bb678fd8ca..00000000000
--- a/Build/source/utils/asymptote/gc-8.2.0.tar.gz
+++ /dev/null
Binary files differ
diff --git a/Build/source/utils/asymptote/gc-8.2.4.tar.gz b/Build/source/utils/asymptote/gc-8.2.4.tar.gz
new file mode 100644
index 00000000000..e9157c62e77
--- /dev/null
+++ b/Build/source/utils/asymptote/gc-8.2.4.tar.gz
Binary files differ
diff --git a/Build/source/utils/asymptote/genv.cc b/Build/source/utils/asymptote/genv.cc
index a191d525db9..8471e3b620a 100644
--- a/Build/source/utils/asymptote/genv.cc
+++ b/Build/source/utils/asymptote/genv.cc
@@ -32,9 +32,12 @@
using namespace types;
using settings::getSetting;
using settings::Setting;
+using vm::importIndex_t;
// Dynamic loading of external libraries.
-types::record *transExternalModule(trans::genv& ge, string filename, symbol id);
+types::record *transExternalModule(
+ trans::genv& ge, string filename, symbol id
+);
namespace trans {
@@ -43,7 +46,7 @@ genv::genv()
{
// Add settings as a module. This is so that the init file ~/.asy/config.asy
// can set settings.
- imap["settings"]=settings::getSettingsModule();
+ imap[importIndex_t("settings","")]=settings::getSettingsModule();
// Translate plain in advance, if we're using autoplain.
if(getSetting<bool>("autoplain")) {
@@ -55,7 +58,7 @@ genv::genv()
Setting("autoplain")=true;
}
#ifdef HAVE_LIBGSL
- imap["gsl"]=trans::getGSLModule();
+ imap[importIndex_t("gsl","")]=trans::getGSLModule();
#endif
}
@@ -86,6 +89,31 @@ record *genv::loadModule(symbol id, string filename) {
return r;
}
+record *genv::loadTemplatedModule(symbol id, string filename,
+ mem::vector<absyntax::namedTyEntry*> *args)
+{
+ // Hackish way to load an external library.
+#if 0
+ if (endswith(".so", filename)) {
+ return transExternalModule(*this, filename, id);
+ }
+#endif
+
+ // Get the abstract syntax tree.
+ absyntax::file *ast = parser::parseFile(filename,"Loading");
+
+ inTranslation.push_front(filename);
+
+ em.sync();
+
+ record *r=ast->transAsTemplatedFile(*this, id, args);
+
+ inTranslation.remove(filename);
+
+ return r;
+}
+
+
void genv::checkRecursion(string filename) {
if (find(inTranslation.begin(), inTranslation.end(), filename) !=
inTranslation.end()) {
@@ -99,7 +127,8 @@ void genv::checkRecursion(string filename) {
record *genv::getModule(symbol id, string filename) {
checkRecursion(filename);
- record *r=imap[filename];
+ importIndex_t Index(filename,"");
+ record *r=imap[Index];
if (r)
return r;
else {
@@ -107,13 +136,31 @@ record *genv::getModule(symbol id, string filename) {
// Don't add an erroneous module to the dictionary in interactive mode, as
// the user may try to load it again.
if (!interact::interactive || !em.errors())
- imap[filename]=r;
+ imap[Index]=r;
return r;
}
}
+record *genv::getTemplatedModule(symbol id, string filename, string sigHandle,
+ mem::vector<absyntax::namedTyEntry*>* args)
+{
+ checkRecursion(filename);
+ importIndex_t Index(filename,sigHandle);
+ record *r=loadTemplatedModule(id, filename, args);
+
+ // Don't add an erroneous module to the dictionary in interactive mode, as
+ // the user may try to load it again.
+ if (!interact::interactive || !em.errors()) {
+ imap[Index]=r;
+ }
+
+ return r;
+
+}
+
+
typedef vm::stack::importInitMap importInitMap;
importInitMap *genv::getInitMap()
@@ -122,7 +169,7 @@ importInitMap *genv::getInitMap()
genv &ge;
initMap(genv &ge)
: ge(ge) {}
- lambda *operator[](string s) {
+ lambda *operator[](importIndex_t s) {
record *r=ge.imap[s];
return r ? r->getInit() : 0;
}
diff --git a/Build/source/utils/asymptote/genv.h b/Build/source/utils/asymptote/genv.h
index 014896e3e26..ad31574a5e2 100644
--- a/Build/source/utils/asymptote/genv.h
+++ b/Build/source/utils/asymptote/genv.h
@@ -31,7 +31,7 @@ namespace trans {
class genv : public gc {
// The initializer functions for imports, indexed by filename.
- typedef mem::map<CONST string,record *> importMap;
+ typedef mem::map<vm::importIndex_t,record *> importMap;
importMap imap;
// List of modules in translation. Used to detect and prevent infinite
@@ -44,12 +44,21 @@ class genv : public gc {
// Translate a module to build the record type.
record *loadModule(symbol name, string s);
+ record *loadTemplatedModule(
+ symbol name, string s, mem::vector<absyntax::namedTyEntry*> *args
+ );
public:
genv();
// Get an imported module, translating if necessary.
record *getModule(symbol name, string s);
+ record *getTemplatedModule(
+ symbol name,
+ string s,
+ string sigHandle,
+ mem::vector<absyntax::namedTyEntry*> *args
+ );
// Uses the filename->record map to build a filename->initializer map to be
// used at runtime.
diff --git a/Build/source/utils/asymptote/glrender.cc b/Build/source/utils/asymptote/glrender.cc
index 02203981387..d360d35a8b1 100644
--- a/Build/source/utils/asymptote/glrender.cc
+++ b/Build/source/utils/asymptote/glrender.cc
@@ -397,9 +397,17 @@ bool Step;
#ifdef HAVE_GL
+stopWatch spinTimer;
+
+void idleFunc(void (*f)())
+{
+ spinTimer.reset();
+ glutIdleFunc(f);
+}
+
void idle()
{
- glutIdleFunc(NULL);
+ idleFunc(NULL);
Xspin=Yspin=Zspin=Animate=Step=false;
}
#endif
@@ -435,7 +443,6 @@ double T[16];
#ifdef HAVE_GL
#ifdef HAVE_LIBGLUT
-timeval lasttime;
int oldWidth,oldHeight;
bool queueScreen=false;
@@ -777,7 +784,7 @@ void deleteShaders()
glDeleteProgram(camp::pixelShader);
}
-void resizeBlendShader(uint maxsize)
+void resizeBlendShader(GLuint maxsize)
{
gl::maxSize=ceilpow2(maxsize);
gl::deleteBlendShader();
@@ -1139,8 +1146,6 @@ void fitscreen(bool reposition=true)
}
case 1: // Fit to screen in one dimension
{
- oldWidth=Width;
- oldHeight=Height;
int w=screenWidth;
int h=screenHeight;
if(w > h*Aspect)
@@ -1165,11 +1170,6 @@ void togglefitscreen()
fitscreen();
}
-void idleFunc(void (*f)())
-{
- glutIdleFunc(f);
-}
-
void screen()
{
if(glthread && !interact::interactive)
@@ -1579,13 +1579,7 @@ void mouse(int button, int state, int x, int y)
double spinstep()
{
- timeval tv;
- gettimeofday(&tv,NULL);
- double step=getSetting<double>("spinstep")*
- (tv.tv_sec-lasttime.tv_sec+
- ((double) tv.tv_usec-lasttime.tv_usec)/1000000.0);
- lasttime=tv;
- return step;
+ return getSetting<double>("spinstep")*spinTimer.seconds(true);
}
void xspin()
@@ -1856,7 +1850,7 @@ void init_osmesa()
OSMESA_DEPTH_BITS,16,
OSMESA_STENCIL_BITS,0,
OSMESA_ACCUM_BITS,0,
- OSMESA_PROFILE,OSMESA_CORE_PROFILE,
+ OSMESA_PROFILE,OSMESA_COMPAT_PROFILE,
OSMESA_CONTEXT_MAJOR_VERSION,4,
OSMESA_CONTEXT_MINOR_VERSION,3,
0,0
@@ -1892,14 +1886,19 @@ void init_osmesa()
#endif // HAVE_LIBOSMESA
}
-#endif /* HAVE_GL */
-
bool NVIDIA()
{
- char *GLSL_VERSION=(char *) glGetString(GL_SHADING_LANGUAGE_VERSION);
+#ifdef GL_SHADING_LANGUAGE_VERSION
+ const char *GLSL_VERSION=(const char *)
+ glGetString(GL_SHADING_LANGUAGE_VERSION);
+#else
+ const char *GLSL_VERSION="";
+#endif
return string(GLSL_VERSION).find("NVIDIA") != string::npos;
}
+#endif /* HAVE_GL */
+
// angle=0 means orthographic.
void glrender(const string& prefix, const picture *pic, const string& format,
double width, double height, double angle, double zoom,
@@ -1908,7 +1907,6 @@ void glrender(const string& prefix, const picture *pic, const string& format,
double *background, size_t nlightsin, triple *lights,
double *diffuse, double *specular, bool view, int oldpid)
{
- gettimeofday(&lasttime,NULL);
Iconify=getSetting<bool>("iconify");
if(zoom == 0.0) zoom=1.0;
@@ -2110,7 +2108,7 @@ void glrender(const string& prefix, const picture *pic, const string& format,
#ifdef FREEGLUT
#ifdef GLUT_INIT_MAJOR_VERSION
- while(true) {
+ for(;;) {
if(multisample > 0)
glutSetOption(GLUT_MULTISAMPLE,multisample);
#endif
@@ -2148,7 +2146,7 @@ void glrender(const string& prefix, const picture *pic, const string& format,
glutInitWindowSize(maxTileWidth,maxTileHeight);
glutInitDisplayMode(displaymode);
fpu_trap(false); // Work around FE_INVALID
- window=glutCreateWindow("");
+ window=glutCreateWindow(Iconify ? "" : "Asymptote rendering window" );
fpu_trap(settings::trap());
glutHideWindow();
}
@@ -2180,7 +2178,8 @@ void glrender(const string& prefix, const picture *pic, const string& format,
if(glinitialize) {
glinitialize=false;
- char *GLSL_VERSION=(char *) glGetString(GL_SHADING_LANGUAGE_VERSION);
+ const char *GLSL_VERSION=(const char *)
+ glGetString(GL_SHADING_LANGUAGE_VERSION);
GLSLversion=(int) (100*atof(GLSL_VERSION)+0.5);
if(GLSLversion < 130) {
@@ -2424,19 +2423,19 @@ void refreshBuffers()
glBindBufferBase(GL_SHADER_STORAGE_BUFFER,2,camp::countBuffer);
if(GPUcompress) {
- glBindBuffer(GL_SHADER_STORAGE_BUFFER,camp::indexBuffer);
- glBufferData(GL_SHADER_STORAGE_BUFFER,gl::pixels*sizeof(GLuint),
- NULL,GL_DYNAMIC_DRAW);
- glBindBufferBase(GL_SHADER_STORAGE_BUFFER,1,camp::indexBuffer);
-
GLuint one=1;
glBindBuffer(GL_ATOMIC_COUNTER_BUFFER,camp::elementsBuffer);
glBufferData(GL_ATOMIC_COUNTER_BUFFER,sizeof(GLuint),&one,
GL_DYNAMIC_DRAW);
glBindBufferBase(GL_ATOMIC_COUNTER_BUFFER,0,camp::elementsBuffer);
- } else
- glClearBufferData(GL_SHADER_STORAGE_BUFFER,GL_R8UI,GL_RED_INTEGER,
- GL_UNSIGNED_BYTE,&zero); // Clear the count buffer
+
+ glBindBuffer(GL_SHADER_STORAGE_BUFFER,camp::indexBuffer);
+ glBufferData(GL_SHADER_STORAGE_BUFFER,gl::pixels*sizeof(GLuint),
+ NULL,GL_DYNAMIC_DRAW);
+ glBindBufferBase(GL_SHADER_STORAGE_BUFFER,1,camp::indexBuffer);
+ }
+ glClearBufferData(GL_SHADER_STORAGE_BUFFER,GL_R32UI,GL_RED_INTEGER,
+ GL_UNSIGNED_INT,&zero); // Clear count or index buffer
glBindBuffer(GL_SHADER_STORAGE_BUFFER,camp::opaqueBuffer);
glBufferData(GL_SHADER_STORAGE_BUFFER,gl::pixels*sizeof(glm::vec4),NULL,
@@ -2464,8 +2463,8 @@ void refreshBuffers()
if(gl::exporting && GPUindexing && !GPUcompress) {
glBindBuffer(GL_SHADER_STORAGE_BUFFER,camp::countBuffer);
- glClearBufferData(GL_SHADER_STORAGE_BUFFER,GL_R8UI,GL_RED_INTEGER,
- GL_UNSIGNED_BYTE,&zero);
+ glClearBufferData(GL_SHADER_STORAGE_BUFFER,GL_R32UI,GL_RED_INTEGER,
+ GL_UNSIGNED_INT,&zero);
glBindBuffer(GL_SHADER_STORAGE_BUFFER,camp::feedbackBuffer);
}
diff --git a/Build/source/utils/asymptote/install-sh b/Build/source/utils/asymptote/install-sh
index 7c56c9c0151..5222b344c8e 100755
--- a/Build/source/utils/asymptote/install-sh
+++ b/Build/source/utils/asymptote/install-sh
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2023-11-23.18; # UTC
+scriptversion=2009-04-28.21; # UTC
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -35,21 +35,25 @@ scriptversion=2023-11-23.18; # UTC
# FSF changes to this file are in the public domain.
#
# Calling this script install-sh is preferred over install.sh, to prevent
-# 'make' implicit rules from creating a file called install from it
+# `make' implicit rules from creating a file called install from it
# when there is no Makefile.
#
# This script is compatible with the BSD install script, but was written
# from scratch.
-tab=' '
nl='
'
-IFS=" $tab$nl"
+IFS=" "" $nl"
-# Set DOITPROG to "echo" to test this script.
+# set DOITPROG to echo to test this script
+# Don't use :- since 4.3BSD and earlier shells don't like it.
doit=${DOITPROG-}
-doit_exec=${doit:-exec}
+if test -z "$doit"; then
+ doit_exec=exec
+else
+ doit_exec=$doit
+fi
# Put in absolute file names if you don't have them in your path;
# or use environment vars.
@@ -64,16 +68,22 @@ mvprog=${MVPROG-mv}
rmprog=${RMPROG-rm}
stripprog=${STRIPPROG-strip}
+posix_glob='?'
+initialize_posix_glob='
+ test "$posix_glob" != "?" || {
+ if (set -f) 2>/dev/null; then
+ posix_glob=
+ else
+ posix_glob=:
+ fi
+ }
+'
+
posix_mkdir=
# Desired mode of installed file.
mode=0755
-# Create dirs (including intermediate dirs) using mode 755.
-# This is like GNU 'install' as of coreutils 8.32 (2020).
-mkdir_umask=22
-
-backupsuffix=
chgrpcmd=
chmodcmd=$chmodprog
chowncmd=
@@ -87,7 +97,7 @@ dir_arg=
dst_arg=
copy_on_change=false
-is_target_a_directory=possibly
+no_target_directory=
usage="\
Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
@@ -104,29 +114,19 @@ Options:
--version display version info and exit.
-c (ignored)
- -C install only if different (preserve data modification time)
+ -C install only if different (preserve the last data modification time)
-d create directories instead of installing files.
-g GROUP $chgrpprog installed files to GROUP.
-m MODE $chmodprog installed files to MODE.
-o USER $chownprog installed files to USER.
- -p pass -p to $cpprog.
-s $stripprog installed files.
- -S SUFFIX attempt to back up existing files, with suffix SUFFIX.
-t DIRECTORY install into DIRECTORY.
-T report an error if DSTFILE is a directory.
Environment variables override the default commands:
CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
RMPROG STRIPPROG
-
-By default, rm is invoked with -f; when overridden with RMPROG,
-it's up to you to specify -f if you want it.
-
-If -S is not specified, no backups are attempted.
-
-Report bugs to <bug-automake@gnu.org>.
-GNU Automake home page: <https://www.gnu.org/software/automake/>.
-General help using GNU software: <https://www.gnu.org/gethelp/>."
+"
while test $# -ne 0; do
case $1 in
@@ -137,62 +137,42 @@ while test $# -ne 0; do
-d) dir_arg=true;;
-g) chgrpcmd="$chgrpprog $2"
- shift;;
+ shift;;
--help) echo "$usage"; exit $?;;
-m) mode=$2
- case $mode in
- *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*)
- echo "$0: invalid mode: $mode" >&2
- exit 1;;
- esac
- shift;;
+ case $mode in
+ *' '* | *' '* | *'
+'* | *'*'* | *'?'* | *'['*)
+ echo "$0: invalid mode: $mode" >&2
+ exit 1;;
+ esac
+ shift;;
-o) chowncmd="$chownprog $2"
- shift;;
-
- -p) cpprog="$cpprog -p";;
+ shift;;
-s) stripcmd=$stripprog;;
- -S) backupsuffix="$2"
- shift;;
+ -t) dst_arg=$2
+ shift;;
- -t)
- is_target_a_directory=always
- dst_arg=$2
- # Protect names problematic for 'test' and other utilities.
- case $dst_arg in
- -* | [=\(\)!]) dst_arg=./$dst_arg;;
- esac
- shift;;
-
- -T) is_target_a_directory=never;;
+ -T) no_target_directory=true;;
--version) echo "$0 $scriptversion"; exit $?;;
- --) shift
- break;;
+ --) shift
+ break;;
- -*) echo "$0: invalid option: $1" >&2
- exit 1;;
+ -*) echo "$0: invalid option: $1" >&2
+ exit 1;;
*) break;;
esac
shift
done
-# We allow the use of options -d and -T together, by making -d
-# take the precedence; this is for compatibility with GNU install.
-
-if test -n "$dir_arg"; then
- if test -n "$dst_arg"; then
- echo "$0: target directory not allowed when installing a directory." >&2
- exit 1
- fi
-fi
-
if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
# When -d is used, all remaining arguments are directories to create.
# When -t is used, the destination is already specified.
@@ -206,10 +186,6 @@ if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
fi
shift # arg
dst_arg=$arg
- # Protect names problematic for 'test' and other utilities.
- case $dst_arg in
- -* | [=\(\)!]) dst_arg=./$dst_arg;;
- esac
done
fi
@@ -218,26 +194,13 @@ if test $# -eq 0; then
echo "$0: no input file specified." >&2
exit 1
fi
- # It's OK to call 'install-sh -d' without argument.
+ # It's OK to call `install-sh -d' without argument.
# This can happen when creating conditional directories.
exit 0
fi
if test -z "$dir_arg"; then
- if test $# -gt 1 || test "$is_target_a_directory" = always; then
- if test ! -d "$dst_arg"; then
- echo "$0: $dst_arg: Is not a directory." >&2
- exit 1
- fi
- fi
-fi
-
-if test -z "$dir_arg"; then
- do_exit='(exit $ret); exit $ret'
- trap "ret=129; $do_exit" 1
- trap "ret=130; $do_exit" 2
- trap "ret=141; $do_exit" 13
- trap "ret=143; $do_exit" 15
+ trap '(exit $?); exit' 1 2 13 15
# Set umask so as not to create temps with too-generous modes.
# However, 'strip' requires both read and write access to temps.
@@ -248,16 +211,16 @@ if test -z "$dir_arg"; then
*[0-7])
if test -z "$stripcmd"; then
- u_plus_rw=
+ u_plus_rw=
else
- u_plus_rw='% 200'
+ u_plus_rw='% 200'
fi
cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
*)
if test -z "$stripcmd"; then
- u_plus_rw=
+ u_plus_rw=
else
- u_plus_rw=,u+rw
+ u_plus_rw=,u+rw
fi
cp_umask=$mode$u_plus_rw;;
esac
@@ -265,9 +228,9 @@ fi
for src
do
- # Protect names problematic for 'test' and other utilities.
+ # Protect names starting with `-'.
case $src in
- -* | [=\(\)!]) src=./$src;;
+ -*) src=./$src;;
esac
if test -n "$dir_arg"; then
@@ -275,10 +238,6 @@ do
dstdir=$dst
test -d "$dstdir"
dstdir_status=$?
- # Don't chown directories that already exist.
- if test $dstdir_status = 0; then
- chowncmd=""
- fi
else
# Waiting for this to be detected by the "$cpprog $src $dsttmp" command
@@ -293,150 +252,185 @@ do
echo "$0: no destination specified." >&2
exit 1
fi
+
dst=$dst_arg
+ # Protect names starting with `-'.
+ case $dst in
+ -*) dst=./$dst;;
+ esac
- # If destination is a directory, append the input filename.
+ # If destination is a directory, append the input filename; won't work
+ # if double slashes aren't ignored.
if test -d "$dst"; then
- if test "$is_target_a_directory" = never; then
- echo "$0: $dst_arg: Is a directory" >&2
- exit 1
+ if test -n "$no_target_directory"; then
+ echo "$0: $dst_arg: Is a directory" >&2
+ exit 1
fi
dstdir=$dst
- dstbase=`basename "$src"`
- case $dst in
- */) dst=$dst$dstbase;;
- *) dst=$dst/$dstbase;;
- esac
+ dst=$dstdir/`basename "$src"`
dstdir_status=0
else
- dstdir=`dirname "$dst"`
+ # Prefer dirname, but fall back on a substitute if dirname fails.
+ dstdir=`
+ (dirname "$dst") 2>/dev/null ||
+ expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$dst" : 'X\(//\)[^/]' \| \
+ X"$dst" : 'X\(//\)$' \| \
+ X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
+ echo X"$dst" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'
+ `
+
test -d "$dstdir"
dstdir_status=$?
fi
fi
- case $dstdir in
- */) dstdirslash=$dstdir;;
- *) dstdirslash=$dstdir/;;
- esac
-
obsolete_mkdir_used=false
if test $dstdir_status != 0; then
case $posix_mkdir in
'')
- # With -d, create the new directory with the user-specified mode.
- # Otherwise, rely on $mkdir_umask.
- if test -n "$dir_arg"; then
- mkdir_mode=-m$mode
- else
- mkdir_mode=
- fi
-
- posix_mkdir=false
- # The $RANDOM variable is not portable (e.g., dash). Use it
- # here however when possible just to lower collision chance.
- tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
-
- trap '
- ret=$?
- rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null
- exit $ret
- ' 0
-
- # Because "mkdir -p" follows existing symlinks and we likely work
- # directly in world-writeable /tmp, make sure that the '$tmpdir'
- # directory is successfully created first before we actually test
- # 'mkdir -p'.
- if (umask $mkdir_umask &&
- $mkdirprog $mkdir_mode "$tmpdir" &&
- exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
- then
- if test -z "$dir_arg" || {
- # Check for POSIX incompatibilities with -m.
- # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
- # other-writable bit of parent directory when it shouldn't.
- # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
- test_tmpdir="$tmpdir/a"
- ls_ld_tmpdir=`ls -ld "$test_tmpdir"`
- case $ls_ld_tmpdir in
- d????-?r-*) different_mode=700;;
- d????-?--*) different_mode=755;;
- *) false;;
- esac &&
- $mkdirprog -m$different_mode -p -- "$test_tmpdir" && {
- ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"`
- test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
- }
- }
- then posix_mkdir=:
- fi
- rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir"
+ # Create intermediate dirs using mode 755 as modified by the umask.
+ # This is like FreeBSD 'install' as of 1997-10-28.
+ umask=`umask`
+ case $stripcmd.$umask in
+ # Optimize common cases.
+ *[2367][2367]) mkdir_umask=$umask;;
+ .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
+
+ *[0-7])
+ mkdir_umask=`expr $umask + 22 \
+ - $umask % 100 % 40 + $umask % 20 \
+ - $umask % 10 % 4 + $umask % 2
+ `;;
+ *) mkdir_umask=$umask,go-w;;
+ esac
+
+ # With -d, create the new directory with the user-specified mode.
+ # Otherwise, rely on $mkdir_umask.
+ if test -n "$dir_arg"; then
+ mkdir_mode=-m$mode
else
- # Remove any dirs left behind by ancient mkdir implementations.
- rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null
+ mkdir_mode=
fi
- trap '' 0;;
+
+ posix_mkdir=false
+ case $umask in
+ *[123567][0-7][0-7])
+ # POSIX mkdir -p sets u+wx bits regardless of umask, which
+ # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
+ ;;
+ *)
+ tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
+ trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
+
+ if (umask $mkdir_umask &&
+ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
+ then
+ if test -z "$dir_arg" || {
+ # Check for POSIX incompatibilities with -m.
+ # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
+ # other-writeable bit of parent directory when it shouldn't.
+ # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
+ ls_ld_tmpdir=`ls -ld "$tmpdir"`
+ case $ls_ld_tmpdir in
+ d????-?r-*) different_mode=700;;
+ d????-?--*) different_mode=755;;
+ *) false;;
+ esac &&
+ $mkdirprog -m$different_mode -p -- "$tmpdir" && {
+ ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
+ test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
+ }
+ }
+ then posix_mkdir=:
+ fi
+ rmdir "$tmpdir/d" "$tmpdir"
+ else
+ # Remove any dirs left behind by ancient mkdir implementations.
+ rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+ fi
+ trap '' 0;;
+ esac;;
esac
if
$posix_mkdir && (
- umask $mkdir_umask &&
- $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
+ umask $mkdir_umask &&
+ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
)
then :
else
- # mkdir does not conform to POSIX,
+ # The umask is ridiculous, or mkdir does not conform to POSIX,
# or it failed possibly due to a race condition. Create the
# directory the slow way, step by step, checking for races as we go.
case $dstdir in
- /*) prefix='/';;
- [-=\(\)!]*) prefix='./';;
- *) prefix='';;
+ /*) prefix='/';;
+ -*) prefix='./';;
+ *) prefix='';;
esac
+ eval "$initialize_posix_glob"
+
oIFS=$IFS
IFS=/
- set -f
+ $posix_glob set -f
set fnord $dstdir
shift
- set +f
+ $posix_glob set +f
IFS=$oIFS
prefixes=
for d
do
- test X"$d" = X && continue
-
- prefix=$prefix$d
- if test -d "$prefix"; then
- prefixes=
- else
- if $posix_mkdir; then
- (umask $mkdir_umask &&
- $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
- # Don't fail if two instances are running concurrently.
- test -d "$prefix" || exit 1
- else
- case $prefix in
- *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
- *) qprefix=$prefix;;
- esac
- prefixes="$prefixes '$qprefix'"
- fi
- fi
- prefix=$prefix/
+ test -z "$d" && continue
+
+ prefix=$prefix$d
+ if test -d "$prefix"; then
+ prefixes=
+ else
+ if $posix_mkdir; then
+ (umask=$mkdir_umask &&
+ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
+ # Don't fail if two instances are running concurrently.
+ test -d "$prefix" || exit 1
+ else
+ case $prefix in
+ *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
+ *) qprefix=$prefix;;
+ esac
+ prefixes="$prefixes '$qprefix'"
+ fi
+ fi
+ prefix=$prefix/
done
if test -n "$prefixes"; then
- # Don't fail if two instances are running concurrently.
- (umask $mkdir_umask &&
- eval "\$doit_exec \$mkdirprog $prefixes") ||
- test -d "$dstdir" || exit 1
- obsolete_mkdir_used=true
+ # Don't fail if two instances are running concurrently.
+ (umask $mkdir_umask &&
+ eval "\$doit_exec \$mkdirprog $prefixes") ||
+ test -d "$dstdir" || exit 1
+ obsolete_mkdir_used=true
fi
fi
fi
@@ -449,25 +443,14 @@ do
else
# Make a couple of temp file names in the proper directory.
- dsttmp=${dstdirslash}_inst.$$_
- rmtmp=${dstdirslash}_rm.$$_
+ dsttmp=$dstdir/_inst.$$_
+ rmtmp=$dstdir/_rm.$$_
# Trap to clean up those temp files at exit.
trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
# Copy the file name to the temp name.
- (umask $cp_umask &&
- { test -z "$stripcmd" || {
- # Create $dsttmp read-write so that cp doesn't create it read-only,
- # which would cause strip to fail.
- if test -z "$doit"; then
- : >"$dsttmp" # No need to fork-exec 'touch'.
- else
- $doit touch "$dsttmp"
- fi
- }
- } &&
- $doit_exec $cpprog "$src" "$dsttmp") &&
+ (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
# and set any options; do chmod last to preserve setuid bits.
#
@@ -482,6 +465,66 @@ do
# If -C, don't bother to copy if it wouldn't change the file.
if $copy_on_change &&
+ old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
+ new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
+
+ eval "$initialize_posix_glob" &&
+ $posix_glob set -f &&
+ set X $old && old=:$2:$4:$5:$6 &&
+ set X $new && new=:$2:$4:$5:$6 &&
+ $posix_glob set +f &&
+
+ test "$old" = "$new" &&
+ $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
+ then
+ rm -f "$dsttmp"
+ else
+ # Rename the file to the real destination.
+ $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
+
+ # The rename failed, perhaps because mv can't rename something else
+ # to itself, or perhaps because mv is so ancient that it does not
+ # support -f.
+ {
+ # Now remove or move aside any old file at destination location.
+ # We try this two ways since rm can't unlink itself on some
+ # systems and the destination file might be busy for other
+ # reasons. In this case, the final cleanup might fail but the new
+ # file should still install successfully.
+ {
+ test ! -f "$dst" ||
+ $doit $rmcmd -f "$dst" 2>/dev/null ||
+ { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
+ { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
+ } ||
+ { echo "$0: cannot unlink or rename $dst" >&2
+ (exit 1); exit 1
+ }
+ } &&
+
+ # Now rename the file to the real destination.
+ $doit $mvcmd "$dsttmp" "$dst"
+ }
+ fi || exit 1
+
+ trap '' 0
+ fi
+done
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
+est -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
+ { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
+ { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
+ { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
+
+ # If -C, don't bother to copy if it wouldn't change the file.
+ if $copy_on_change &&
old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
set -f &&
@@ -493,13 +536,6 @@ do
then
rm -f "$dsttmp"
else
- # If $backupsuffix is set, and the file being installed
- # already exists, attempt a backup. Don't worry if it fails,
- # e.g., if mv doesn't support -f.
- if test -n "$backupsuffix" && test -f "$dst"; then
- $doit $mvcmd -f "$dst" "$dst$backupsuffix" 2>/dev/null
- fi
-
# Rename the file to the real destination.
$doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
@@ -514,9 +550,9 @@ do
# file should still install successfully.
{
test ! -f "$dst" ||
- $doit $rmcmd "$dst" 2>/dev/null ||
+ $doit $rmcmd -f "$dst" 2>/dev/null ||
{ $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
- { $doit $rmcmd "$rmtmp" 2>/dev/null; :; }
+ { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
} ||
{ echo "$0: cannot unlink or rename $dst" >&2
(exit 1); exit 1
diff --git a/Build/source/utils/asymptote/lex.yy.cc b/Build/source/utils/asymptote/lex.yy.cc
index c948d097139..0f0ea992142 100644
--- a/Build/source/utils/asymptote/lex.yy.cc
+++ b/Build/source/utils/asymptote/lex.yy.cc
@@ -838,7 +838,7 @@ typedef size_t (*input_f) (char* bif, size_t max_size);
input_f yy_input = NULL;
-void setlexer(input_f input, string filename)
+void setlexer(input_f input, string filename)
{
YY_FLUSH_BUFFER;
yywrap();
@@ -858,7 +858,7 @@ position lexerPos()
p.init(fi, tokPos);
return p;
}
-
+
namespace {
position here()
@@ -871,7 +871,7 @@ void adjust()
tokPos = charPos;
charPos += yyleng;
yylval.pos = here();
-}
+}
void savesymbol(symbol name)
{
@@ -938,7 +938,7 @@ void setEOF(string message) {
eof=true;
eofMessage=message;
}
-
+
// Called by code outside of the lexer to see if a parse error was caused by
// running out of input.
bool lexerEOF()
@@ -1394,9 +1394,9 @@ YY_RULE_SETUP
case 6:
YY_RULE_SETUP
#line 228 "camp.l"
-{adjust();
+{adjust();
BEGIN INITIAL;
- getstring();
+ getstring();
return STRING; }
YY_BREAK
case YY_STATE_EOF(texstring):
@@ -1404,7 +1404,7 @@ case YY_STATE_EOF(texstring):
{adjust();
setEOF("string not terminated");
BEGIN INITIAL;
- getstring();
+ getstring();
return GARBAGE;
}
YY_BREAK
@@ -1444,9 +1444,9 @@ YY_RULE_SETUP
case 12:
YY_RULE_SETUP
#line 246 "camp.l"
-{adjust();
+{adjust();
BEGIN INITIAL;
- getstring();
+ getstring();
return STRING; }
YY_BREAK
case YY_STATE_EOF(cstring):
@@ -1454,7 +1454,7 @@ case YY_STATE_EOF(cstring):
{adjust();
setEOF("string not terminated");
BEGIN INITIAL;
- getstring();
+ getstring();
return GARBAGE;
}
YY_BREAK
@@ -1511,7 +1511,7 @@ YY_RULE_SETUP
char x=(char)(yytext[1]-'0');
append(x);
continue;
- }
+ }
YY_BREAK
case 23:
YY_RULE_SETUP
@@ -1520,7 +1520,7 @@ YY_RULE_SETUP
char x=(char)((yytext[1]-'0')*8+yytext[2]-'0');
append(x);
continue;
- }
+ }
YY_BREAK
case 24:
YY_RULE_SETUP
@@ -1530,29 +1530,29 @@ YY_RULE_SETUP
+yytext[3]-'0');
append(x);
continue;
- }
+ }
YY_BREAK
case 25:
YY_RULE_SETUP
#line 281 "camp.l"
{adjust();
- char x=(char) (yytext[2] <= '9' ? yytext[2]-'0' :
+ char x=(char) (yytext[2] <= '9' ? yytext[2]-'0' :
10+yytext[2]-'A');
append(x);
continue;
- }
+ }
YY_BREAK
case 26:
YY_RULE_SETUP
#line 287 "camp.l"
{adjust();
- char x=(char) ((yytext[2] <= '9' ? yytext[2]-'0' :
+ char x=(char) ((yytext[2] <= '9' ? yytext[2]-'0' :
10+yytext[2]-'A')*16
- +(yytext[3] <= '9' ? yytext[3]-'0' :
+ +(yytext[3] <= '9' ? yytext[3]-'0' :
10+yytext[3]-'A'));
append(x);
continue;
- }
+ }
YY_BREAK
case 27:
YY_RULE_SETUP
@@ -1951,11 +1951,11 @@ case 105:
YY_RULE_SETUP
#line 382 "camp.l"
try {
- adjust(); yylval.e= new intExp(here(), lexical::cast<Int>(yytext));
+ adjust(); yylval.e= new intExp(here(), lexical::cast<Int>(yytext));
} catch (lexical::bad_cast&) {
error();
em << "invalid integer";
- yylval.e= new intExp(here(), 0);
+ yylval.e= new intExp(here(), 0);
} return LIT;
YY_BREAK
case 106:
@@ -1966,7 +1966,7 @@ try {
} catch (lexical::bad_cast&) {
error();
em << "invalid real";
- yylval.e= new realExp(here(), 0);
+ yylval.e= new realExp(here(), 0);
} return LIT;
YY_BREAK
case 107:
@@ -2008,7 +2008,7 @@ YY_RULE_SETUP
case 113:
YY_RULE_SETUP
#line 409 "camp.l"
-{adjust(); continue;}
+{adjust(); continue;}
YY_BREAK
case 114:
/* rule 114 can match eol */
@@ -2059,7 +2059,7 @@ YY_RULE_SETUP
#line 431 "camp.l"
{
makesymbol();
- return ID; }
+ return ID; }
YY_BREAK
case 120:
YY_RULE_SETUP
diff --git a/Build/source/utils/asymptote/lspserv.cc b/Build/source/utils/asymptote/lspserv.cc
index 42f135b35fd..6ec74e2ccf0 100644
--- a/Build/source/utils/asymptote/lspserv.cc
+++ b/Build/source/utils/asymptote/lspserv.cc
@@ -113,7 +113,7 @@ std::string wslUnix2Dos(std::string const& unixPath)
TextDocumentHover::Either fromString(std::string const& str)
{
- auto strobj=std::make_pair(boost::make_optional(str), optional<lsMarkedString>());
+ auto strobj=std::make_pair(make_optional(str), optional<lsMarkedString>());
std::vector<decltype(strobj)> vec{strobj};
return std::make_pair(vec, nullopt);
}
@@ -465,7 +465,7 @@ std::string wslUnix2Dos(std::string const& unixPath)
size_t lineOffset = 0;
auto& strLines = fileContentsPtr->at(getDocIdentifierRawPath(req.params.textDocument));
- char ch=strLines[line + lineOffset + 1][colm - 1 + offset];
+ char ch=strLines[line + lineOffset - 1][colm - 1 + offset];
while (
ch != ')' and ch != ';'
@@ -577,7 +577,7 @@ std::string wslUnix2Dos(std::string const& unixPath)
posRanges.splice(posRanges.begin(), ctx->searchLitFuncPositions(std::get<0>(st.value()), pos));
}
}
- rsp.result.first=boost::make_optional(std::vector<lsLocation>());
+ rsp.result.first=make_optional(std::vector<lsLocation>());
std::transform(
posRanges.begin(), posRanges.end(), std::back_inserter(rsp.result.first.value()),
[](posRangeInFile const& posRange)
diff --git a/Build/source/utils/asymptote/lspserv.h b/Build/source/utils/asymptote/lspserv.h
index 74a21659a34..44f6b8978e6 100644
--- a/Build/source/utils/asymptote/lspserv.h
+++ b/Build/source/utils/asymptote/lspserv.h
@@ -66,13 +66,13 @@ namespace AsymptoteLsp
template<typename TLeft, typename TRight>
inline optional<std::pair<optional<TLeft>, optional<TRight>>> opt_left(TLeft const& opt)
{
- return boost::make_optional(std::make_pair(optional<TLeft>(opt), optional<TRight>()));
+ return make_optional(std::make_pair(optional<TLeft>(opt), optional<TRight>()));
}
template<typename TLeft, typename TRight>
inline optional<std::pair<optional<TLeft>, optional<TRight>>> opt_right(TRight const& opt)
{
- return boost::make_optional(std::make_pair(optional<TLeft>(), optional<TRight>(opt)));
+ return make_optional(std::make_pair(optional<TLeft>(), optional<TRight>(opt)));
}
TextDocumentHover::Either fromString(std::string const &str);
diff --git a/Build/source/utils/asymptote/main.cc b/Build/source/utils/asymptote/main.cc
index 197f2b0eb3f..0728ebcdafb 100644
--- a/Build/source/utils/asymptote/main.cc
+++ b/Build/source/utils/asymptote/main.cc
@@ -191,7 +191,7 @@ void *asymain(void *A)
fprintf(camp::pipeout,"\n");
fflush(camp::pipeout);
}
- while(true) {
+ for(;;) {
processFile("-",true);
try {
setOptions(args->argc,args->argv);
@@ -281,7 +281,7 @@ int main(int argc, char *argv[])
sigemptyset(&set);
sigaddset(&set, SIGCHLD);
pthread_sigmask(SIG_BLOCK, &set, NULL);
- while(true) {
+ for(;;) {
Signal(SIGURG,exitHandler);
camp::glrenderWrapper();
gl::initialize=true;
diff --git a/Build/source/utils/asymptote/memory.h b/Build/source/utils/asymptote/memory.h
index 180260bc9d4..5c5d7a41d01 100644
--- a/Build/source/utils/asymptote/memory.h
+++ b/Build/source/utils/asymptote/memory.h
@@ -134,7 +134,11 @@ GC_CONTAINER(vector);
GC_CONTAINER(deque);
template <typename T, typename Container = vector<T> >
-struct stack : public std::stack<T, Container>, public gc {
+struct stack : public std::stack<T, Container>, public gc {};
+
+template <typename T, typename S >
+struct pair : public std::pair<T, S>, public gc {
+ pair(T t, S s) : std::pair<T,S>(t,s) {}
};
#define PAIR_ALLOC gc_allocator<std::pair<CONST Key,T> > /* space */
diff --git a/Build/source/utils/asymptote/parser.cc b/Build/source/utils/asymptote/parser.cc
index 31df6f44fa8..cdda1f9a28a 100644
--- a/Build/source/utils/asymptote/parser.cc
+++ b/Build/source/utils/asymptote/parser.cc
@@ -171,14 +171,7 @@ size_t curlCallback(char *data, size_t size, size_t n, stringstream& buf)
return Size;
}
-#ifdef CURLOPT_XFERINFODATA
-#define CURL_OFF_T curl_off_t
-#else
-#define CURL_OFF_T double
-#define CURLOPT_XFERINFOFUNCTION CURLOPT_PROGRESSFUNCTION
-#endif
-
-int curlProgress(void *, CURL_OFF_T, CURL_OFF_T, CURL_OFF_T, CURL_OFF_T)
+int curlProgress(void *, curl_off_t, curl_off_t, curl_off_t, curl_off_t)
{
return errorstream::interrupt ? -1 : 0;
}
diff --git a/Build/source/utils/asymptote/picture.cc b/Build/source/utils/asymptote/picture.cc
index 2412863f606..65c72cbca1e 100644
--- a/Build/source/utils/asymptote/picture.cc
+++ b/Build/source/utils/asymptote/picture.cc
@@ -310,7 +310,6 @@ bbox3 picture::bounds3()
b3=bbox3();
matrixstack ms;
- size_t i=0;
for(nodelist::const_iterator p=nodes.begin(); p != nodes.end(); ++p) {
assert(*p);
if((*p)->begingroup3())
@@ -319,7 +318,6 @@ bbox3 picture::bounds3()
ms.pop();
else
(*p)->bounds(ms.T(),b3);
- i++;
}
lastnumber3=n;
@@ -464,7 +462,7 @@ string dvisvgmCommand(mem::vector<string>& cmd, const string& outname)
string libgs=getSetting<string>("libgs");
if(!libgs.empty())
cmd.push_back("--libgs="+libgs);
- cmd.push_back("--optimize");
+ cmd.push_back("--optimize=collapse-groups,group-attributes,remove-clippaths,simplify-text,simplify-transform");
push_split(cmd,getSetting<string>("dvisvgmOptions"));
string outfile=stripDir(outname);
if(!outfile.empty())
@@ -657,6 +655,7 @@ int picture::epstopdf(const string& epsname, const string& pdfname)
cmd.push_back("-dEncodeColorImages="+compress);
cmd.push_back("-dEncodeGrayImages="+compress);
cmd.push_back("-dCompatibilityLevel=1.4");
+ cmd.push_back("-dTransferFunctionInfo=/Apply");
if(!getSetting<bool>("autorotate"))
cmd.push_back("-dAutoRotatePages=/None");
cmd.push_back("-g"+String(max(ceil(getSetting<double>("paperwidth")),1.0))
@@ -977,10 +976,8 @@ bool picture::shipout(picture *preamble, const string& Prefix,
else htmlformat=false;
}
-#ifndef HAVE_LIBGLM
if(outputformat == "v3d")
- camp::reportError("to support V3D rendering, please install glm header files, then ./configure; make");
-#endif
+ camp::reportError("v3d format only supports 3D files");
bool svgformat=outputformat == "svg";
bool png=outputformat == "png";
@@ -1000,7 +997,7 @@ bool picture::shipout(picture *preamble, const string& Prefix,
bool pdf=settings::pdf(texengine);
bool standardout=Prefix == "-";
- string prefix=standardout ? standardprefix : stripExt(Prefix);
+ string prefix=standardout ? standardprefix : Prefix;
string preformat=nativeformat();
bool epsformat=outputformat == "eps";
@@ -1363,10 +1360,14 @@ bool picture::shipout3(const string& prefix, const string& format,
if(width <= 0 || height <= 0) return false;
bool webgl=format == "html";
+ bool v3d=format == "v3d";
#ifndef HAVE_LIBGLM
if(webgl)
camp::reportError("to support WebGL rendering, please install glm header files, then ./configure; make");
+
+ if(v3d)
+ camp::reportError("to support V3D rendering, please install glm header files, then ./configure; make");
#endif
#ifndef HAVE_LIBOSMESA
@@ -1421,7 +1422,6 @@ bool picture::shipout3(const string& prefix, const string& format,
#endif
#endif
- bool v3d=format == "v3d";
bool format3d=webgl || v3d;
if(!format3d) {
@@ -1517,7 +1517,7 @@ bool picture::shipout3(const string& prefix, const string& format,
#ifdef HAVE_GL
if(format3dWait) {
- gl::format3dWait=false;
+ format3dWait=false;
#ifdef HAVE_PTHREAD
endwait(initSignal,initLock);
#endif
diff --git a/Build/source/utils/asymptote/process.h b/Build/source/utils/asymptote/process.h
index e076c39dfb3..913af4a7dd9 100644
--- a/Build/source/utils/asymptote/process.h
+++ b/Build/source/utils/asymptote/process.h
@@ -55,7 +55,7 @@ public:
// Return first available index
size_t available() {
size_t index=0;
- for(typename Pointer::iterator p=pointer.begin(); p != pointer.end(); ++p) {
+ for(auto p=pointer.begin(); p != pointer.end(); ++p) {
if(*p == NULL) {return index;}
++index;
}
@@ -74,7 +74,7 @@ public:
}
~terminator() {
- for(typename Pointer::iterator p=pointer.begin(); p != pointer.end(); ++p) {
+ for(auto p=pointer.begin(); p != pointer.end(); ++p) {
if(*p != NULL) {
(*p)->~T();
(*p)=NULL;
@@ -92,6 +92,7 @@ typedef std::pair<size_t,size_t> linecolumn;
typedef mem::map<CONST linecolumn,string> xkey_t;
typedef mem::deque<camp::transform> xtransform_t;
typedef mem::map<CONST string,xtransform_t> xmap_t;
+typedef mem::map<CONST size_t,types::signature *> sigMap_t;
struct processDataStruct {
texstream tex; // Bi-directional pipe to latex (to find label bbox)
@@ -103,6 +104,8 @@ struct processDataStruct {
camp::pen defaultpen;
camp::pen currentpen;
+ sigMap_t sigMap;
+
// For xasy:
string fileName;
position topPos;
diff --git a/Build/source/utils/asymptote/profiler.h b/Build/source/utils/asymptote/profiler.h
index 046d85e403b..4c69d8d7f68 100644
--- a/Build/source/utils/asymptote/profiler.h
+++ b/Build/source/utils/asymptote/profiler.h
@@ -13,6 +13,7 @@
#include <iostream>
#include "inst.h"
+#include "seconds.h"
namespace vm {
@@ -292,27 +293,17 @@ class profiler : public gc {
analyseNode(emptynode);
}
-
// Timing data.
- struct timeval timestamp;
+ utils::cpuTimer timestamp;
void startLap() {
- gettimeofday(&timestamp, 0);
- }
-
- long long timeAndResetLap() {
- struct timeval now;
- gettimeofday(&now, 0);
- long long nsecs = 1000000000LL * (now.tv_sec - timestamp.tv_sec) +
- 1000LL * (now.tv_usec - timestamp.tv_usec);
- timestamp = now;
- return nsecs;
+ timestamp.reset();
}
// Called whenever the stack is about to change, in order to record the time
// duration for the current node.
void recordTime() {
- topnode().nsecs += timeAndResetLap();
+ topnode().nsecs += (long long) timestamp.nanoseconds(true);
}
public:
diff --git a/Build/source/utils/asymptote/psfile.cc b/Build/source/utils/asymptote/psfile.cc
index 924f3c1872d..60152e8d185 100644
--- a/Build/source/utils/asymptote/psfile.cc
+++ b/Build/source/utils/asymptote/psfile.cc
@@ -219,29 +219,25 @@ void psfile::setcolor(const pen& p, const string& begin="",
bool psfile::transparentFormat(string outputformat)
{
- return
+ return (pdftex() && outputformat == "") ||
outputformat == "pdf" || outputformat == "html" ||
- outputformat == "svg" || outputformat == "png" ||
- outputformat == "v3d";
+ outputformat == "svg" || outputformat == "png";
}
void psfile::setopacity(const pen& p)
{
- if(p.blend() != lastpen.blend()) {
- *out << "/" << p.blend() << " .setblendmode" << newl;
- }
+ if(transparentFormat(settings::getSetting<string>("outformat"))) {
+ if(p.blend() != lastpen.blend())
+ *out << "/" << p.blend() << " .setblendmode" << newl;
- string outputformat=settings::getSetting<string>("outformat");
- if(p.opacity() != lastpen.opacity() &&
- ((pdftex() && outputformat == "") || transparentFormat(outputformat))) {
- *out << p.opacity() << " .setfillconstantalpha" << newl
- << p.opacity() << " .setstrokeconstantalpha" << newl;
- }
+ if(p.opacity() != lastpen.opacity())
+ *out << p.opacity() << " .setfillconstantalpha" << newl
+ << p.opacity() << " .setstrokeconstantalpha" << newl;
- lastpen.settransparency(p);
+ lastpen.settransparency(p);
+ }
}
-
void psfile::setpen(pen p)
{
p.convert();
diff --git a/Build/source/utils/asymptote/revision.cc b/Build/source/utils/asymptote/revision.cc
index 06f4c5f8f8a..1aa18b936a6 100644
--- a/Build/source/utils/asymptote/revision.cc
+++ b/Build/source/utils/asymptote/revision.cc
@@ -1,2 +1,2 @@
-const char *REVISION="2.85";
+const char *REVISION="2.87";
const char *AsyGLVersion="1.02";
diff --git a/Build/source/utils/asymptote/runlabel.cc b/Build/source/utils/asymptote/runlabel.cc
index 6605bc1b848..fc55f079bc3 100644
--- a/Build/source/utils/asymptote/runlabel.cc
+++ b/Build/source/utils/asymptote/runlabel.cc
@@ -475,7 +475,7 @@ void gen_runlabel4(stack *Stack)
gs.block(false,false);
// TODO: Simplify by connecting the pipes directly.
- while(true) {
+ for(;;) {
string out;
if(typesetter.isopen()) {
typesetter >> out;
diff --git a/Build/source/utils/asymptote/runlabel.in b/Build/source/utils/asymptote/runlabel.in
index 06354a90450..8d3b601fae7 100644
--- a/Build/source/utils/asymptote/runlabel.in
+++ b/Build/source/utils/asymptote/runlabel.in
@@ -395,7 +395,7 @@ patharray2 *textpath(stringarray *s, penarray *p)
gs.block(false,false);
// TODO: Simplify by connecting the pipes directly.
- while(true) {
+ for(;;) {
string out;
if(typesetter.isopen()) {
typesetter >> out;
diff --git a/Build/source/utils/asymptote/runpicture.cc b/Build/source/utils/asymptote/runpicture.cc
index 70be72fd98f..e8a153463aa 100644
--- a/Build/source/utils/asymptote/runpicture.cc
+++ b/Build/source/utils/asymptote/runpicture.cc
@@ -856,7 +856,6 @@ void gen_runpicture46(stack *Stack)
const string Done="Done";
const string Error="Error";
- unsigned arg=0;
xmap_t xmap=processData().xmap;
transform Tinv=inverse(T);
@@ -937,7 +936,6 @@ void gen_runpicture46(stack *Stack)
}
fflush(pipeout);
- ++arg;
}
} else {
drawElement *e=t.isIdentity() ? *p : (*p)->transformed(t);
@@ -951,7 +949,7 @@ void gen_runpicture46(stack *Stack)
}
string outname=buildname(prefix,xformat);
- F->shipout(preamble,outname,xformat,false,false);
+ F->shipout(preamble,stripExt(outname),xformat,false,false);
fprintf(pipeout,"%s\n",Done.c_str());
fflush(pipeout);
delete F;
@@ -961,7 +959,7 @@ void gen_runpicture46(stack *Stack)
// Three-dimensional picture and surface operations
// Bezier curve
-#line 633 "runpicture.in"
+#line 631 "runpicture.in"
// void _draw(picture *f, path3 g, triple center=Zero, penarray *p, real opacity, real shininess, real metallic, real fresnel0, Int interaction=0);
void gen_runpicture47(stack *Stack)
{
@@ -974,7 +972,7 @@ void gen_runpicture47(stack *Stack)
triple center=vm::pop<triple>(Stack,Zero);
path3 g=vm::pop<path3>(Stack);
picture * f=vm::pop<picture *>(Stack);
-#line 636 "runpicture.in"
+#line 634 "runpicture.in"
size_t n=g.size();
for(unsigned int i=0; i < n; ++i)
f->append(new drawPath3(g.subpath((Int) i,Int(i+1)),center,*p,opacity,
@@ -983,7 +981,7 @@ void gen_runpicture47(stack *Stack)
}
// Bezier patch
-#line 645 "runpicture.in"
+#line 643 "runpicture.in"
// void draw(picture *f, triplearray2 *P, triple center, bool straight, penarray *p, real opacity, real shininess, real metallic, real fresnel0, penarray *colors, Int interaction, Int digits, bool primitive=false);
void gen_runpicture48(stack *Stack)
{
@@ -1000,7 +998,7 @@ void gen_runpicture48(stack *Stack)
triple center=vm::pop<triple>(Stack);
triplearray2 * P=vm::pop<triplearray2 *>(Stack);
picture * f=vm::pop<picture *>(Stack);
-#line 649 "runpicture.in"
+#line 647 "runpicture.in"
f->append(new drawBezierPatch(*P,center,straight,*p,opacity,shininess,
metallic,fresnel0,*colors,
(Interaction) intcast(interaction),
@@ -1008,7 +1006,7 @@ void gen_runpicture48(stack *Stack)
}
// Bezier triangle
-#line 657 "runpicture.in"
+#line 655 "runpicture.in"
// void drawbeziertriangle(picture *f, triplearray2 *P, triple center, bool straight, penarray *p, real opacity, real shininess, real metallic, real fresnel0, penarray *colors, Int interaction, Int digits, bool primitive=false);
void gen_runpicture49(stack *Stack)
{
@@ -1025,7 +1023,7 @@ void gen_runpicture49(stack *Stack)
triple center=vm::pop<triple>(Stack);
triplearray2 * P=vm::pop<triplearray2 *>(Stack);
picture * f=vm::pop<picture *>(Stack);
-#line 662 "runpicture.in"
+#line 660 "runpicture.in"
f->append(new drawBezierTriangle(*P,center,straight,*p,opacity,shininess,
metallic,fresnel0,*colors,
(Interaction) intcast(interaction),
@@ -1033,7 +1031,7 @@ void gen_runpicture49(stack *Stack)
}
// General NURBS curve
-#line 670 "runpicture.in"
+#line 668 "runpicture.in"
// void draw(picture *f, triplearray *P, realarray *knot, realarray *weights=emptyarray, pen p);
void gen_runpicture50(stack *Stack)
{
@@ -1042,12 +1040,12 @@ void gen_runpicture50(stack *Stack)
realarray * knot=vm::pop<realarray *>(Stack);
triplearray * P=vm::pop<triplearray *>(Stack);
picture * f=vm::pop<picture *>(Stack);
-#line 672 "runpicture.in"
+#line 670 "runpicture.in"
f->append(new drawNurbsPath3(*P,knot,weights,p));
}
// General NURBS surface
-#line 677 "runpicture.in"
+#line 675 "runpicture.in"
// void draw(picture *f, triplearray2 *P, realarray *uknot, realarray *vknot, realarray2 *weights=emptyarray, penarray *p, real opacity, real shininess,real metallic, real fresnel0, penarray *colors);
void gen_runpicture51(stack *Stack)
{
@@ -1062,13 +1060,13 @@ void gen_runpicture51(stack *Stack)
realarray * uknot=vm::pop<realarray *>(Stack);
triplearray2 * P=vm::pop<triplearray2 *>(Stack);
picture * f=vm::pop<picture *>(Stack);
-#line 680 "runpicture.in"
+#line 678 "runpicture.in"
f->append(new drawNurbs(*P,uknot,vknot,weights,*p,opacity,shininess,
metallic,fresnel0,*colors));
}
// Sphere primitive
-#line 686 "runpicture.in"
+#line 684 "runpicture.in"
// void drawSphere(picture *f, realarray2 *t, bool half=false, penarray *p, real opacity, real shininess, real metallic, real fresnel0, Int type);
void gen_runpicture52(stack *Stack)
{
@@ -1081,13 +1079,13 @@ void gen_runpicture52(stack *Stack)
bool half=vm::pop<bool>(Stack,false);
realarray2 * t=vm::pop<realarray2 *>(Stack);
picture * f=vm::pop<picture *>(Stack);
-#line 689 "runpicture.in"
+#line 687 "runpicture.in"
f->append(new drawSphere(*t,half,*p,opacity,shininess,metallic,fresnel0,
intcast(type)));
}
// Cylinder primitive
-#line 695 "runpicture.in"
+#line 693 "runpicture.in"
// void drawCylinder(picture *f, realarray2 *t, penarray *p, real opacity, real shininess, real metallic, real fresnel0, bool core=false);
void gen_runpicture53(stack *Stack)
{
@@ -1099,12 +1097,12 @@ void gen_runpicture53(stack *Stack)
penarray * p=vm::pop<penarray *>(Stack);
realarray2 * t=vm::pop<realarray2 *>(Stack);
picture * f=vm::pop<picture *>(Stack);
-#line 698 "runpicture.in"
+#line 696 "runpicture.in"
f->append(new drawCylinder(*t,*p,opacity,shininess,metallic,fresnel0,core));
}
// Disk primitive
-#line 703 "runpicture.in"
+#line 701 "runpicture.in"
// void drawDisk(picture *f, realarray2 *t, penarray *p, real opacity, real shininess, real metallic, real fresnel0);
void gen_runpicture54(stack *Stack)
{
@@ -1115,12 +1113,12 @@ void gen_runpicture54(stack *Stack)
penarray * p=vm::pop<penarray *>(Stack);
realarray2 * t=vm::pop<realarray2 *>(Stack);
picture * f=vm::pop<picture *>(Stack);
-#line 705 "runpicture.in"
+#line 703 "runpicture.in"
f->append(new drawDisk(*t,*p,opacity,shininess,metallic,fresnel0));
}
// Tube primitive
-#line 710 "runpicture.in"
+#line 708 "runpicture.in"
// void drawTube(picture *f, triplearray *g, real width, penarray *p, real opacity, real shininess, real metallic, real fresnel0, triple min, triple max, bool core=false);
void gen_runpicture55(stack *Stack)
{
@@ -1135,13 +1133,13 @@ void gen_runpicture55(stack *Stack)
real width=vm::pop<real>(Stack);
triplearray * g=vm::pop<triplearray *>(Stack);
picture * f=vm::pop<picture *>(Stack);
-#line 713 "runpicture.in"
+#line 711 "runpicture.in"
f->append(new drawTube(*g,width,*p,opacity,shininess,metallic,fresnel0,
min,max,core));
}
// Draw pixel
-#line 719 "runpicture.in"
+#line 717 "runpicture.in"
// void drawpixel(picture *f, triple v, pen p, real width=1.0);
void gen_runpicture56(stack *Stack)
{
@@ -1149,12 +1147,12 @@ void gen_runpicture56(stack *Stack)
pen p=vm::pop<pen>(Stack);
triple v=vm::pop<triple>(Stack);
picture * f=vm::pop<picture *>(Stack);
-#line 720 "runpicture.in"
+#line 718 "runpicture.in"
f->append(new drawPixel(v,p,width));
}
// Draw triangles
-#line 725 "runpicture.in"
+#line 723 "runpicture.in"
// void draw(picture *f, triplearray *v, Intarray2 *vi, triple center=Zero, triplearray *n, Intarray2 *ni, penarray *p, real opacity, real shininess, real metallic, real fresnel0, penarray *c=emptyarray, Intarray2 *ci=emptyarray, Int interaction);
void gen_runpicture57(stack *Stack)
{
@@ -1172,64 +1170,64 @@ void gen_runpicture57(stack *Stack)
Intarray2 * vi=vm::pop<Intarray2 *>(Stack);
triplearray * v=vm::pop<triplearray *>(Stack);
picture * f=vm::pop<picture *>(Stack);
-#line 730 "runpicture.in"
+#line 728 "runpicture.in"
f->append(new drawTriangles(*v,*vi,center,*n,*ni,*p,opacity,shininess,
metallic,fresnel0,*c,*ci,
(Interaction) intcast(interaction)));
}
-#line 736 "runpicture.in"
+#line 734 "runpicture.in"
// triple min3(picture *f);
void gen_runpicture58(stack *Stack)
{
picture * f=vm::pop<picture *>(Stack);
-#line 737 "runpicture.in"
+#line 735 "runpicture.in"
{Stack->push<triple>(f->bounds3().Min()); return;}
}
-#line 741 "runpicture.in"
+#line 739 "runpicture.in"
// triple max3(picture *f);
void gen_runpicture59(stack *Stack)
{
picture * f=vm::pop<picture *>(Stack);
-#line 742 "runpicture.in"
+#line 740 "runpicture.in"
{Stack->push<triple>(f->bounds3().Max()); return;}
}
-#line 746 "runpicture.in"
+#line 744 "runpicture.in"
// triple size3(picture *f);
void gen_runpicture60(stack *Stack)
{
picture * f=vm::pop<picture *>(Stack);
-#line 747 "runpicture.in"
+#line 745 "runpicture.in"
bbox3 b=f->bounds3();
{Stack->push<triple>(b.Max()-b.Min()); return;}
}
-#line 752 "runpicture.in"
+#line 750 "runpicture.in"
// pair minratio(picture *f);
void gen_runpicture61(stack *Stack)
{
picture * f=vm::pop<picture *>(Stack);
-#line 753 "runpicture.in"
+#line 751 "runpicture.in"
{Stack->push<pair>(f->ratio(::min)); return;}
}
-#line 757 "runpicture.in"
+#line 755 "runpicture.in"
// pair maxratio(picture *f);
void gen_runpicture62(stack *Stack)
{
picture * f=vm::pop<picture *>(Stack);
-#line 758 "runpicture.in"
+#line 756 "runpicture.in"
{Stack->push<pair>(f->ratio(::max)); return;}
}
-#line 762 "runpicture.in"
+#line 760 "runpicture.in"
// bool is3D(picture *f);
void gen_runpicture63(stack *Stack)
{
picture * f=vm::pop<picture *>(Stack);
-#line 763 "runpicture.in"
+#line 761 "runpicture.in"
{Stack->push<bool>(f->have3D()); return;}
}
@@ -1333,39 +1331,39 @@ void gen_runpicture_venv(venv &ve)
addFunc(ve, run::gen_runpicture45, primVoid(), SYM(xmap), formal(primString(), SYM(key), false, false), formal(primTransform(), SYM(t), true, false));
#line 515 "runpicture.in"
addFunc(ve, run::gen_runpicture46, primVoid(), SYM(deconstruct), formal(primPicture(), SYM(f), false, false), formal(primPicture(), SYM(preamble), true, false), formal(primTransform(), SYM(t), true, false));
-#line 629 "runpicture.in"
+#line 627 "runpicture.in"
addFunc(ve, run::gen_runpicture47, primVoid(), SYM(_draw), formal(primPicture(), SYM(f), false, false), formal(primPath3(), SYM(g), false, false), formal(primTriple(), SYM(center), true, false), formal(penArray(), SYM(p), false, false), formal(primReal(), SYM(opacity), false, false), formal(primReal(), SYM(shininess), false, false), formal(primReal(), SYM(metallic), false, false), formal(primReal(), SYM(fresnel0), false, false), formal(primInt(), SYM(interaction), true, false));
-#line 644 "runpicture.in"
+#line 642 "runpicture.in"
addFunc(ve, run::gen_runpicture48, primVoid(), SYM(draw), formal(primPicture(), SYM(f), false, false), formal(tripleArray2(), SYM(p), false, false), formal(primTriple(), SYM(center), false, false), formal(primBoolean(), SYM(straight), false, false), formal(penArray(), SYM(p), false, false), formal(primReal(), SYM(opacity), false, false), formal(primReal(), SYM(shininess), false, false), formal(primReal(), SYM(metallic), false, false), formal(primReal(), SYM(fresnel0), false, false), formal(penArray(), SYM(colors), false, false), formal(primInt(), SYM(interaction), false, false), formal(primInt(), SYM(digits), false, false), formal(primBoolean(), SYM(primitive), true, false));
-#line 656 "runpicture.in"
+#line 654 "runpicture.in"
addFunc(ve, run::gen_runpicture49, primVoid(), SYM(drawbeziertriangle), formal(primPicture(), SYM(f), false, false), formal(tripleArray2(), SYM(p), false, false), formal(primTriple(), SYM(center), false, false), formal(primBoolean(), SYM(straight), false, false), formal(penArray(), SYM(p), false, false), formal(primReal(), SYM(opacity), false, false), formal(primReal(), SYM(shininess), false, false), formal(primReal(), SYM(metallic), false, false), formal(primReal(), SYM(fresnel0), false, false), formal(penArray(), SYM(colors), false, false), formal(primInt(), SYM(interaction), false, false), formal(primInt(), SYM(digits), false, false), formal(primBoolean(), SYM(primitive), true, false));
-#line 669 "runpicture.in"
+#line 667 "runpicture.in"
addFunc(ve, run::gen_runpicture50, primVoid(), SYM(draw), formal(primPicture(), SYM(f), false, false), formal(tripleArray(), SYM(p), false, false), formal(realArray(), SYM(knot), false, false), formal(realArray(), SYM(weights), true, false), formal(primPen(), SYM(p), false, false));
-#line 676 "runpicture.in"
+#line 674 "runpicture.in"
addFunc(ve, run::gen_runpicture51, primVoid(), SYM(draw), formal(primPicture(), SYM(f), false, false), formal(tripleArray2(), SYM(p), false, false), formal(realArray(), SYM(uknot), false, false), formal(realArray(), SYM(vknot), false, false), formal(realArray2(), SYM(weights), true, false), formal(penArray(), SYM(p), false, false), formal(primReal(), SYM(opacity), false, false), formal(primReal(), SYM(shininess), false, false), formal(primReal(), SYM(metallic), false, false), formal(primReal(), SYM(fresnel0), false, false), formal(penArray(), SYM(colors), false, false));
-#line 685 "runpicture.in"
+#line 683 "runpicture.in"
addFunc(ve, run::gen_runpicture52, primVoid(), SYM(drawSphere), formal(primPicture(), SYM(f), false, false), formal(realArray2(), SYM(t), false, false), formal(primBoolean(), SYM(half), true, false), formal(penArray(), SYM(p), false, false), formal(primReal(), SYM(opacity), false, false), formal(primReal(), SYM(shininess), false, false), formal(primReal(), SYM(metallic), false, false), formal(primReal(), SYM(fresnel0), false, false), formal(primInt(), SYM(type), false, false));
-#line 694 "runpicture.in"
+#line 692 "runpicture.in"
addFunc(ve, run::gen_runpicture53, primVoid(), SYM(drawCylinder), formal(primPicture(), SYM(f), false, false), formal(realArray2(), SYM(t), false, false), formal(penArray(), SYM(p), false, false), formal(primReal(), SYM(opacity), false, false), formal(primReal(), SYM(shininess), false, false), formal(primReal(), SYM(metallic), false, false), formal(primReal(), SYM(fresnel0), false, false), formal(primBoolean(), SYM(core), true, false));
-#line 702 "runpicture.in"
+#line 700 "runpicture.in"
addFunc(ve, run::gen_runpicture54, primVoid(), SYM(drawDisk), formal(primPicture(), SYM(f), false, false), formal(realArray2(), SYM(t), false, false), formal(penArray(), SYM(p), false, false), formal(primReal(), SYM(opacity), false, false), formal(primReal(), SYM(shininess), false, false), formal(primReal(), SYM(metallic), false, false), formal(primReal(), SYM(fresnel0), false, false));
-#line 709 "runpicture.in"
+#line 707 "runpicture.in"
addFunc(ve, run::gen_runpicture55, primVoid(), SYM(drawTube), formal(primPicture(), SYM(f), false, false), formal(tripleArray(), SYM(g), false, false), formal(primReal(), SYM(width), false, false), formal(penArray(), SYM(p), false, false), formal(primReal(), SYM(opacity), false, false), formal(primReal(), SYM(shininess), false, false), formal(primReal(), SYM(metallic), false, false), formal(primReal(), SYM(fresnel0), false, false), formal(primTriple(), SYM(min), false, false), formal(primTriple(), SYM(max), false, false), formal(primBoolean(), SYM(core), true, false));
-#line 718 "runpicture.in"
+#line 716 "runpicture.in"
addFunc(ve, run::gen_runpicture56, primVoid(), SYM(drawpixel), formal(primPicture(), SYM(f), false, false), formal(primTriple(), SYM(v), false, false), formal(primPen(), SYM(p), false, false), formal(primReal(), SYM(width), true, false));
-#line 724 "runpicture.in"
+#line 722 "runpicture.in"
addFunc(ve, run::gen_runpicture57, primVoid(), SYM(draw), formal(primPicture(), SYM(f), false, false), formal(tripleArray(), SYM(v), false, false), formal(IntArray2(), SYM(vi), false, false), formal(primTriple(), SYM(center), true, false), formal(tripleArray(), SYM(n), false, false), formal(IntArray2(), SYM(ni), false, false), formal(penArray(), SYM(p), false, false), formal(primReal(), SYM(opacity), false, false), formal(primReal(), SYM(shininess), false, false), formal(primReal(), SYM(metallic), false, false), formal(primReal(), SYM(fresnel0), false, false), formal(penArray(), SYM(c), true, false), formal(IntArray2(), SYM(ci), true, false), formal(primInt(), SYM(interaction), false, false));
-#line 736 "runpicture.in"
+#line 734 "runpicture.in"
addFunc(ve, run::gen_runpicture58, primTriple(), SYM(min3), formal(primPicture(), SYM(f), false, false));
-#line 741 "runpicture.in"
+#line 739 "runpicture.in"
addFunc(ve, run::gen_runpicture59, primTriple(), SYM(max3), formal(primPicture(), SYM(f), false, false));
-#line 746 "runpicture.in"
+#line 744 "runpicture.in"
addFunc(ve, run::gen_runpicture60, primTriple(), SYM(size3), formal(primPicture(), SYM(f), false, false));
-#line 752 "runpicture.in"
+#line 750 "runpicture.in"
addFunc(ve, run::gen_runpicture61, primPair(), SYM(minratio), formal(primPicture(), SYM(f), false, false));
-#line 757 "runpicture.in"
+#line 755 "runpicture.in"
addFunc(ve, run::gen_runpicture62, primPair(), SYM(maxratio), formal(primPicture(), SYM(f), false, false));
-#line 762 "runpicture.in"
+#line 760 "runpicture.in"
addFunc(ve, run::gen_runpicture63, primBoolean(), SYM(is3D), formal(primPicture(), SYM(f), false, false));
}
diff --git a/Build/source/utils/asymptote/runpicture.in b/Build/source/utils/asymptote/runpicture.in
index 696e303ace6..56431b9be77 100644
--- a/Build/source/utils/asymptote/runpicture.in
+++ b/Build/source/utils/asymptote/runpicture.in
@@ -525,7 +525,6 @@ void deconstruct(picture *f, picture *preamble=NULL, transform T=identity)
const string Done="Done";
const string Error="Error";
- unsigned arg=0;
xmap_t xmap=processData().xmap;
transform Tinv=inverse(T);
@@ -606,7 +605,6 @@ void deconstruct(picture *f, picture *preamble=NULL, transform T=identity)
}
fflush(pipeout);
- ++arg;
}
} else {
drawElement *e=t.isIdentity() ? *p : (*p)->transformed(t);
@@ -620,7 +618,7 @@ void deconstruct(picture *f, picture *preamble=NULL, transform T=identity)
}
string outname=buildname(prefix,xformat);
- F->shipout(preamble,outname,xformat,false,false);
+ F->shipout(preamble,stripExt(outname),xformat,false,false);
fprintf(pipeout,"%s\n",Done.c_str());
fflush(pipeout);
delete F;
diff --git a/Build/source/utils/asymptote/runstring.cc b/Build/source/utils/asymptote/runstring.cc
index 912df0ce348..a9c557af78a 100644
--- a/Build/source/utils/asymptote/runstring.cc
+++ b/Build/source/utils/asymptote/runstring.cc
@@ -351,6 +351,7 @@ void gen_runstring11(stack *Stack)
}
string f=format->substr(start-p0,p-start);
+ f.insert(p-start-1,"ll");
const char *oldlocale=NULL;
@@ -378,7 +379,7 @@ void gen_runstring11(stack *Stack)
{Stack->push<string>(out.str()); return;}
}
-#line 262 "runstring.in"
+#line 263 "runstring.in"
// string format(string *format, bool forcemath=false, string separator, real x, string locale=emptystring);
void gen_runstring12(stack *Stack)
{
@@ -387,7 +388,7 @@ void gen_runstring12(stack *Stack)
string separator=vm::pop<string>(Stack);
bool forcemath=vm::pop<bool>(Stack,false);
string * format=vm::pop<string *>(Stack);
-#line 264 "runstring.in"
+#line 265 "runstring.in"
if(*format == "%") {Stack->push<string>(""); return;} // Temporary workaround for github Issue #29.
bool tex=getSetting<string>("tex") != "none";
@@ -514,12 +515,12 @@ void gen_runstring12(stack *Stack)
{Stack->push<string>(out.str()); return;}
}
-#line 391 "runstring.in"
+#line 392 "runstring.in"
// Int hex(string s);
void gen_runstring13(stack *Stack)
{
string s=vm::pop<string>(Stack);
-#line 392 "runstring.in"
+#line 393 "runstring.in"
istringstream is(s);
is.setf(std::ios::hex,std::ios::basefield);
Int value;
@@ -529,45 +530,45 @@ void gen_runstring13(stack *Stack)
error(buf);
}
-#line 402 "runstring.in"
+#line 403 "runstring.in"
// Int ascii(string s);
void gen_runstring14(stack *Stack)
{
string s=vm::pop<string>(Stack);
-#line 403 "runstring.in"
+#line 404 "runstring.in"
{Stack->push<Int>(s.empty() ? -1 : (unsigned char) s[0]); return;}
}
-#line 407 "runstring.in"
+#line 408 "runstring.in"
// string string(Int x);
void gen_runstring15(stack *Stack)
{
Int x=vm::pop<Int>(Stack);
-#line 408 "runstring.in"
+#line 409 "runstring.in"
ostringstream buf;
buf << x;
{Stack->push<string>(buf.str()); return;}
}
-#line 414 "runstring.in"
+#line 415 "runstring.in"
// string string(real x, Int digits=DBL_DIG);
void gen_runstring16(stack *Stack)
{
Int digits=vm::pop<Int>(Stack,DBL_DIG);
real x=vm::pop<real>(Stack);
-#line 415 "runstring.in"
+#line 416 "runstring.in"
ostringstream buf;
buf.precision(digits);
buf << x;
{Stack->push<string>(buf.str()); return;}
}
-#line 422 "runstring.in"
+#line 423 "runstring.in"
// string time(string format=defaulttimeformat);
void gen_runstring17(stack *Stack)
{
string format=vm::pop<string>(Stack,defaulttimeformat);
-#line 423 "runstring.in"
+#line 424 "runstring.in"
#ifdef HAVE_STRFTIME
const time_t bintime=time(NULL);
if(!strftime(Time,nTime,format.c_str(),localtime(&bintime))) {Stack->push<string>(""); return;}
@@ -577,13 +578,13 @@ void gen_runstring17(stack *Stack)
#endif
}
-#line 433 "runstring.in"
+#line 434 "runstring.in"
// string time(Int seconds, string format=defaulttimeformat);
void gen_runstring18(stack *Stack)
{
string format=vm::pop<string>(Stack,defaulttimeformat);
Int seconds=vm::pop<Int>(Stack);
-#line 434 "runstring.in"
+#line 435 "runstring.in"
#ifdef HAVE_STRFTIME
const time_t bintime=seconds;
if(!strftime(Time,nTime,format.c_str(),localtime(&bintime))) {Stack->push<string>(""); return;}
@@ -595,13 +596,13 @@ void gen_runstring18(stack *Stack)
#endif
}
-#line 446 "runstring.in"
+#line 447 "runstring.in"
// Int seconds(string t=emptystring, string format=emptystring);
void gen_runstring19(stack *Stack)
{
string format=vm::pop<string>(Stack,emptystring);
string t=vm::pop<string>(Stack,emptystring);
-#line 447 "runstring.in"
+#line 448 "runstring.in"
#if defined(HAVE_STRPTIME)
const time_t bintime=time(NULL);
tm tm=*localtime(&bintime);
@@ -642,21 +643,21 @@ void gen_runstring_venv(venv &ve)
addFunc(ve, run::gen_runstring10, primString(), SYM(replace), formal(primString(), SYM(s), false, false), formal(stringArray2(), SYM(translate), false, false));
#line 208 "runstring.in"
addFunc(ve, run::gen_runstring11, primString(), SYM(format), formal(primString(), SYM(format), false, false), formal(primInt(), SYM(x), false, false), formal(primString(), SYM(locale), true, false));
-#line 262 "runstring.in"
+#line 263 "runstring.in"
addFunc(ve, run::gen_runstring12, primString(), SYM(format), formal(primString(), SYM(format), false, false), formal(primBoolean(), SYM(forcemath), true, false), formal(primString(), SYM(separator), false, false), formal(primReal(), SYM(x), false, false), formal(primString(), SYM(locale), true, false));
-#line 391 "runstring.in"
+#line 392 "runstring.in"
addFunc(ve, run::gen_runstring13, primInt(), SYM(hex), formal(primString(), SYM(s), false, false));
-#line 402 "runstring.in"
+#line 403 "runstring.in"
addFunc(ve, run::gen_runstring14, primInt(), SYM(ascii), formal(primString(), SYM(s), false, false));
-#line 407 "runstring.in"
+#line 408 "runstring.in"
addFunc(ve, run::gen_runstring15, primString(), SYM(string), formal(primInt(), SYM(x), false, false));
-#line 414 "runstring.in"
+#line 415 "runstring.in"
addFunc(ve, run::gen_runstring16, primString(), SYM(string), formal(primReal(), SYM(x), false, false), formal(primInt(), SYM(digits), true, false));
-#line 422 "runstring.in"
+#line 423 "runstring.in"
addFunc(ve, run::gen_runstring17, primString(), SYM(time), formal(primString(), SYM(format), true, false));
-#line 433 "runstring.in"
+#line 434 "runstring.in"
addFunc(ve, run::gen_runstring18, primString(), SYM(time), formal(primInt(), SYM(seconds), false, false), formal(primString(), SYM(format), true, false));
-#line 446 "runstring.in"
+#line 447 "runstring.in"
addFunc(ve, run::gen_runstring19, primInt(), SYM(seconds), formal(primString(), SYM(t), true, false), formal(primString(), SYM(format), true, false));
}
diff --git a/Build/source/utils/asymptote/runstring.in b/Build/source/utils/asymptote/runstring.in
index 415db53652b..b57a9215159 100644
--- a/Build/source/utils/asymptote/runstring.in
+++ b/Build/source/utils/asymptote/runstring.in
@@ -232,6 +232,7 @@ string format(string *format, Int x, string locale=emptystring)
}
string f=format->substr(start-p0,p-start);
+ f.insert(p-start-1,"ll");
const char *oldlocale=NULL;
diff --git a/Build/source/utils/asymptote/runtime.cc b/Build/source/utils/asymptote/runtime.cc
index 2cead744b4e..b0e7e110050 100644
--- a/Build/source/utils/asymptote/runtime.cc
+++ b/Build/source/utils/asymptote/runtime.cc
@@ -1135,8 +1135,9 @@ void gen_runtime86(stack *Stack)
void loadModule(stack *Stack)
{
string * index=vm::pop<string *>(Stack);
+ string * filename=vm::pop<string *>(Stack);
#line 766 "runtime.in"
- Stack->load(*index);
+ Stack->load(*filename,*index);
}
#line 770 "runtime.in"
@@ -1525,8 +1526,8 @@ void gen_runtime115(stack *Stack)
::times(&buf);
array *t=new array(5);
- (*t)[0]=cpuTime.seconds();
- (*t)[1]=((real) buf.tms_stime)*ticktime;
+ (*t)[0]=cpuTime.seconds(); // Includes system time
+ (*t)[1]=0.0;
(*t)[2]=((real) buf.tms_cutime)*ticktime;
(*t)[3]=((real) buf.tms_cstime)*ticktime;
(*t)[4]=wallClock.seconds();
diff --git a/Build/source/utils/asymptote/runtime.in b/Build/source/utils/asymptote/runtime.in
index 986259c10b5..63c49c38631 100644
--- a/Build/source/utils/asymptote/runtime.in
+++ b/Build/source/utils/asymptote/runtime.in
@@ -762,9 +762,9 @@ string location() {
}
// Wrapper for the stack::load() method.
-void :loadModule(string *index)
+void :loadModule(string *filename, string *index)
{
- Stack->load(*index);
+ Stack->load(*filename,*index);
}
string cd(string s=emptystring)
@@ -1044,8 +1044,8 @@ realarray *_cputime()
::times(&buf);
array *t=new array(5);
- (*t)[0]=cpuTime.seconds();
- (*t)[1]=((real) buf.tms_stime)*ticktime;
+ (*t)[0]=cpuTime.seconds(); // Includes system time
+ (*t)[1]=0.0;
(*t)[2]=((real) buf.tms_cutime)*ticktime;
(*t)[3]=((real) buf.tms_cstime)*ticktime;
(*t)[4]=wallClock.seconds();
diff --git a/Build/source/utils/asymptote/seconds.h b/Build/source/utils/asymptote/seconds.h
index 6b72f997b0f..f8d94b92c1a 100644
--- a/Build/source/utils/asymptote/seconds.h
+++ b/Build/source/utils/asymptote/seconds.h
@@ -2,6 +2,7 @@
#define __seconds_h__ 1
#include <chrono>
+#include <sys/resource.h>
namespace utils {
@@ -10,7 +11,7 @@ namespace utils {
#define getpid GetCurrentProcessId
inline double cpuTime() {
FILETIME a,b,c,d;
- return GetProcessTimes(GetCurrentThread(),&a,&b,&c,&d) != 0 ?
+ return GetProcessTimes(GetCurrentProcess(),&a,&b,&c,&d) != 0 ?
(double) (d.dwLowDateTime |
((unsigned long long)d.dwHighDateTime << 32))*100.0 : 0.0;
}
@@ -18,28 +19,18 @@ inline double cpuTime() {
#include <unistd.h>
#include <time.h>
-#ifdef HAVE_PTHREAD
-#include <pthread.h>
-#endif
-
inline double cpuTime() {
+#ifdef CLOCK_PROCESS_CPUTIME_ID
timespec t;
- clockid_t cid;
-
-#ifdef CLOCK_THREAD_CPUTIME_ID
- cid=CLOCK_THREAD_CPUTIME_ID;
+ clock_gettime(CLOCK_PROCESS_CPUTIME_ID,&t);
+ return 1.0e9*t.tv_sec+t.tv_nsec;
#else
- #ifdef HAVE_PTHREAD
- pthread_getcpuclockid(pthread_self(),&cid);
- #elif CLOCK_PROCESS_CPUTIME_ID
- cid=CLOCK_PROCESS_CPUTIME_ID;
- #else
- cid=CLOCK_REALTIME;
- #endif
+ struct rusage ru;
+ if(getrusage(RUSAGE_SELF, &ru))
+ return 0;
+ return 1.0e9*(ru.ru_utime.tv_sec+ru.ru_stime.tv_sec)
+ +1.0e3*(ru.ru_utime.tv_usec+ru.ru_stime.tv_usec);
#endif
-
- clock_gettime(cid,&t);
- return 1.0e9*t.tv_sec+t.tv_nsec;
}
#endif
@@ -59,7 +50,8 @@ public:
auto Stop=std::chrono::steady_clock::now();
double ns=std::chrono::duration_cast<std::chrono::nanoseconds>
(Stop-Start).count();
- if(reset) Start=Stop;
+ if(reset)
+ Start=Stop;
return ns;
}
@@ -82,17 +74,20 @@ public:
reset();
}
- double nanoseconds() {
+ double nanoseconds(bool reset=false) {
auto Stop=std::chrono::steady_clock::now();
double stop=cpuTime();
-
- return
- std::min((double) std::chrono::duration_cast<std::chrono::nanoseconds>
- (Stop-Start).count(),stop-start);
+ double ns=std::min((double) std::chrono::duration_cast<std::chrono::nanoseconds>
+ (Stop-Start).count(),stop-start);
+ if(reset) {
+ Start=Stop;
+ start=stop;
+ }
+ return ns;
}
- double seconds() {
- return 1.0e-9*nanoseconds();
+ double seconds(bool reset=false) {
+ return 1.0e-9*nanoseconds(reset);
}
};
diff --git a/Build/source/utils/asymptote/settings.cc b/Build/source/utils/asymptote/settings.cc
index ecf67ce8486..8dbea780c16 100644
--- a/Build/source/utils/asymptote/settings.cc
+++ b/Build/source/utils/asymptote/settings.cc
@@ -1248,6 +1248,8 @@ void initSettings() {
"Emulate unimplemented SVG shading", true));
addOption(new boolSetting("prc", 0,
"Embed 3D PRC graphics in PDF output", false));
+ addOption(new boolSetting("v3d", 0,
+ "Embed 3D V3D graphics in PDF output", false));
addOption(new boolSetting("toolbar", 0,
"Show 3D toolbar in PDF output", true));
addOption(new boolSetting("axes3", 0,
@@ -1387,7 +1389,7 @@ void initSettings() {
"Allow read from other directory",
&globalRead, true));
addSecureSetting(new stringSetting("outname", 'o', "name",
- "Alternative output directory/filename"));
+ "Alternative output directory/file prefix"));
addOption(new stringOption("cd", 0, "directory", "Set current directory",
&startpath));
@@ -1407,10 +1409,13 @@ void initSettings() {
"Input code over multiple lines at the prompt"));
addOption(new boolSetting("xasy", 0,
"Interactive mode for xasy"));
+#ifdef HAVE_LSP
addOption(new boolSetting("lsp", 0, "Interactive mode for the Language Server Protocol"));
- addOption(new boolSetting("wsl", 0, "Run asy under the Windows Subsystem for Linux."));
addOption(new envSetting("lspport", ""));
addOption(new envSetting("lsphost", "127.0.0.1"));
+#endif
+
+ addOption(new boolSetting("wsl", 0, "Run asy under the Windows Subsystem for Linux"));
addOption(new boolSetting("wait", 0,
"Wait for child processes to finish before exiting"));
diff --git a/Build/source/utils/asymptote/stack.cc b/Build/source/utils/asymptote/stack.cc
index 7c0d8a91954..7072265176c 100644
--- a/Build/source/utils/asymptote/stack.cc
+++ b/Build/source/utils/asymptote/stack.cc
@@ -250,7 +250,7 @@ void stack::debug()
break;
case 'c': // continue
default:
- for(mem::list<bpinfo>::iterator p=bplist.begin(); p != bplist.end(); ++p) {
+ for(auto p=bplist.begin(); p != bplist.end(); ++p) {
if(curPos.match(p->f.name()) && curPos.match(p->f.line()) &&
(newline || !curPos.match(breakPos.filename()) ||
!curPos.match(breakPos.Line()))) {
@@ -554,17 +554,18 @@ void stack::runWithOrWithoutClosure(lambda *l, vars_t vars, vars_t parent)
#undef FRAMEVAR
}
-void stack::load(string index) {
- frame *inst=instMap[index];
+void stack::load(string filename, string sigHandle) {
+ importIndex_t Index(filename,sigHandle);
+ frame *inst=instMap[Index];
if (inst)
push(inst);
else {
func f;
assert(initMap);
- f.body=(*initMap)[index];
+ f.body=(*initMap)[Index];
assert(f.body);
run(&f);
- instMap[index]=get<frame *>(top());
+ instMap[Index]=get<frame *>(top());
}
}
diff --git a/Build/source/utils/asymptote/stack.h b/Build/source/utils/asymptote/stack.h
index ba24f7bcd52..eeff080f14b 100644
--- a/Build/source/utils/asymptote/stack.h
+++ b/Build/source/utils/asymptote/stack.h
@@ -42,13 +42,15 @@ class runnable;
extern bool indebugger;
+typedef mem::pair<string, string> importIndex_t;
+
class stack {
public:
typedef frame* vars_t;
struct importInitMap {
virtual ~importInitMap() {}
- virtual lambda *operator[](string) = 0;
+ virtual lambda *operator[](importIndex_t) = 0;
};
private:
@@ -64,7 +66,7 @@ private:
// The stack stores a map of initialized imported modules by name, so that
// each module is initialized only once and each import refers to the same
// instance.
- typedef mem::map<CONST string,frame *> importInstanceMap;
+ typedef mem::map<CONST importIndex_t,frame *> importInstanceMap;
importInstanceMap instMap;
// One can associate an environment to embedded code while running.
@@ -106,9 +108,9 @@ public:
void breakpoint(absyntax::runnable *r=NULL);
void debug();
- // Put an import (indexed by name) on top of the stack, initializing it if
- // necessary.
- void load(string index);
+ // Put an import (indexed by filename and signature) on top of the
+ // stack, initializing it if necessary.
+ void load(string filename, string sigHandle);
// These are so that built-in functions can easily manipulate the stack
void push(item next) {
@@ -164,4 +166,3 @@ public:
} // namespace vm
#endif // STACK_H
-
diff --git a/Build/source/utils/asymptote/symbolmaps.cc b/Build/source/utils/asymptote/symbolmaps.cc
index 27c073e70b1..aabc8fc2b9d 100644
--- a/Build/source/utils/asymptote/symbolmaps.cc
+++ b/Build/source/utils/asymptote/symbolmaps.cc
@@ -70,7 +70,7 @@ namespace AsymptoteLsp
if (posMatches and !isOperator)
{
posInFile endPos(pos.first, endCharacter + 1);
- return boost::make_optional(std::make_tuple(syLit, pos, endPos));
+ return make_optional(std::make_tuple(syLit, pos, endPos));
}
}
return nullopt;
diff --git a/Build/source/utils/asymptote/symbolmaps.h b/Build/source/utils/asymptote/symbolmaps.h
index d78e4b1563e..c2388e12560 100644
--- a/Build/source/utils/asymptote/symbolmaps.h
+++ b/Build/source/utils/asymptote/symbolmaps.h
@@ -11,10 +11,6 @@
#include "LibLsp/lsp/lsPosition.h"
#include "LibLsp/lsp/textDocument/documentColor.h"
-#ifndef boost
-#define nullopt boost::none
-#endif
-
namespace AsymptoteLsp
{
struct SymbolLit
diff --git a/Build/source/utils/asymptote/tests/Makefile b/Build/source/utils/asymptote/tests/Makefile
index 659737bfd4d..d26b65050e4 100644
--- a/Build/source/utils/asymptote/tests/Makefile
+++ b/Build/source/utils/asymptote/tests/Makefile
@@ -1,6 +1,6 @@
.NOTPARALLEL:
-TESTDIRS = string arith frames types imp array pic gs
+TESTDIRS = string arith frames types imp array pic gs io template
EXTRADIRS = gsl output
diff --git a/Build/source/utils/asymptote/tests/io/csv.asy b/Build/source/utils/asymptote/tests/io/csv.asy
new file mode 100644
index 00000000000..d0ef00b21f3
--- /dev/null
+++ b/Build/source/utils/asymptote/tests/io/csv.asy
@@ -0,0 +1,18 @@
+import TestLib;
+
+StartTest("csv");
+{
+ real[] a=input("io/input_with_nan.csv").csv();
+ assert(a.length == 20);
+ for (int i=0; i<4; ++i)
+ assert(a[i] == i);
+ for (int i=4; i<8; ++i)
+ assert(isnan(a[i]));
+ for (int i=8; i<12; ++i)
+ assert(isnan(a[i]));
+ for (int i=12; i<16; ++i)
+ assert(a[i] == inf);
+ for (int i=16; i<20; ++i)
+ assert(a[i] == -inf);
+}
+EndTest();
diff --git a/Build/source/utils/asymptote/tests/io/input_with_nan.csv b/Build/source/utils/asymptote/tests/io/input_with_nan.csv
new file mode 100644
index 00000000000..c431fe2a0ab
--- /dev/null
+++ b/Build/source/utils/asymptote/tests/io/input_with_nan.csv
@@ -0,0 +1,5 @@
+ 0, 1, 2, 3
+ NaN, NAN, nan, nAn
+-NaN,-NAN,-nan,-nAn
+ InF, INF, inf, iNf
+-InF,-INF,-inf,-iNf
diff --git a/Build/source/utils/asymptote/tests/template/imports/wrapper.asy b/Build/source/utils/asymptote/tests/template/imports/wrapper.asy
new file mode 100644
index 00000000000..1e44cdd7933
--- /dev/null
+++ b/Build/source/utils/asymptote/tests/template/imports/wrapper.asy
@@ -0,0 +1,12 @@
+typedef import(T);
+
+struct Wrapper_T {
+ T t;
+ void operator init(T t) {
+ this.t = t;
+ }
+}
+
+Wrapper_T wrap(T t) {
+ return Wrapper_T(t);
+} \ No newline at end of file
diff --git a/Build/source/utils/asymptote/tests/template/imports/wrapperWithEquals.asy b/Build/source/utils/asymptote/tests/template/imports/wrapperWithEquals.asy
new file mode 100644
index 00000000000..0423112e65b
--- /dev/null
+++ b/Build/source/utils/asymptote/tests/template/imports/wrapperWithEquals.asy
@@ -0,0 +1,11 @@
+typedef import(T);
+
+access "template/imports/wrapper"(T=T) as wrapper;
+unravel wrapper;
+
+bool operator == (Wrapper_T a, Wrapper_T b) {
+ return a.t == b.t;
+}
+bool operator != (Wrapper_T a, Wrapper_T b) {
+ return a.t != b.t;
+} \ No newline at end of file
diff --git a/Build/source/utils/asymptote/tests/template/mapArrayTest.asy b/Build/source/utils/asymptote/tests/template/mapArrayTest.asy
new file mode 100644
index 00000000000..a110b0ed69b
--- /dev/null
+++ b/Build/source/utils/asymptote/tests/template/mapArrayTest.asy
@@ -0,0 +1,13 @@
+import TestLib;
+
+StartTest("mapArray");
+
+from mapArray(Src=real, Dst=string) access map;
+
+real[] a = {1.0, 1.5, 2.5, -3.14};
+string[] b = map(new string(real x) {return (string)x;},
+ a);
+
+assert(all(b == new string[] {"1", "1.5", "2.5", "-3.14"}));
+
+EndTest(); \ No newline at end of file
diff --git a/Build/source/utils/asymptote/tests/template/singletype.asy b/Build/source/utils/asymptote/tests/template/singletype.asy
new file mode 100644
index 00000000000..b2c9a88e01c
--- /dev/null
+++ b/Build/source/utils/asymptote/tests/template/singletype.asy
@@ -0,0 +1,33 @@
+import TestLib;
+
+StartTest("singletype");
+
+struct A {}
+
+// TODO: Should we import operator== and alias for free?
+from "template/imports/wrapperWithEquals"(T=int) access
+ Wrapper_T as Wrapper_int,
+ wrap, operator ==, alias;
+// TODO: Create a way to pass operator==(A, A) to the template, either
+// implicitly or explicitly.
+// from "template/imports/wrapperWithEquals"(T=A) access
+// Wrapper_T as Wrapper_A, wrap, operator ==, alias; // error
+from "template/imports/wrapper"(T=A)
+ access Wrapper_T as Wrapper_A, wrap, alias;
+
+// Basic functionality for ints:
+Wrapper_int w1 = wrap(5);
+Wrapper_int w2 = Wrapper_int(5); // tests constructor
+assert(w1.t == 5);
+assert(w2.t == 5);
+assert(w1 == w2);
+assert(!alias(w1, w2));
+
+// Basic functionality for A:
+var a = new A;
+Wrapper_A w3 = wrap(a);
+Wrapper_A w4 = Wrapper_A(a); // tests constructor
+assert(w3.t == w4.t);
+assert(!alias(w3, w4));
+
+EndTest();
diff --git a/Build/source/utils/asymptote/texfile.cc b/Build/source/utils/asymptote/texfile.cc
index 54fa5e35772..bb8efe5dcc7 100644
--- a/Build/source/utils/asymptote/texfile.cc
+++ b/Build/source/utils/asymptote/texfile.cc
@@ -524,10 +524,10 @@ void svgtexfile::begingradientshade(bool axial, ColorSpace colorspace,
begintransform();
*out << "<" << type << "Gradient id='grad" << gradientcount;
if(axial) {
- *out << "' x1='" << a.getx()*ps2tex << "' y1='" << (box.top-a.gety())*ps2tex
- << "' x2='" << b.getx()*ps2tex << "' y2='" << (box.top-b.gety())*ps2tex;
+ *out << "' x1='" << (a.getx()-offset.getx())*ps2tex << "' y1='" << (offset.gety()-a.gety())*ps2tex
+ << "' x2='" << (b.getx()-offset.getx())*ps2tex << "' y2='" << (offset.gety()-b.gety())*ps2tex;
} else {
- *out << "' cx='" << b.getx()*ps2tex << "' cy='" << (box.top-b.gety())*ps2tex
+ *out << "' cx='" << (b.getx()-offset.getx())*ps2tex << "' cy='" << (offset.gety()-b.gety())*ps2tex
<< "' r='" << rb*ps2tex;
}
*out <<"' gradientUnits='userSpaceOnUse'>" << nl
diff --git a/Build/source/utils/asymptote/texfile.h b/Build/source/utils/asymptote/texfile.h
index c15861a2670..7387349c4ce 100644
--- a/Build/source/utils/asymptote/texfile.h
+++ b/Build/source/utils/asymptote/texfile.h
@@ -416,23 +416,29 @@ public:
beginpath();
}
+// Workaround libc++ parsing bug under MacOS.
+#ifdef __APPLE__
+ const string sep=" ";
+#else
+ const string sep="";
+#endif
void moveto(pair z) {
- *out << "M";
+ *out << sep << "M";
writeshifted(z);
}
void lineto(pair z) {
- *out << "L";
+ *out << sep << "L";
writeshifted(z);
}
void curveto(pair zp, pair zm, pair z1) {
- *out << "C";
+ *out << sep << "C";
writeshifted(zp); writeshifted(zm); writeshifted(z1);
}
void closepath() {
- *out << "Z";
+ *out << sep << "Z";
}
string rgbhex(pen p) {
diff --git a/Build/source/utils/asymptote/types.cc b/Build/source/utils/asymptote/types.cc
index dee660c3cad..3e2a94eb253 100644
--- a/Build/source/utils/asymptote/types.cc
+++ b/Build/source/utils/asymptote/types.cc
@@ -18,6 +18,7 @@
#include "runtriple.h"
#include "access.h"
#include "virtualfieldaccess.h"
+#include "process.h"
namespace run {
void arrayDeleteHelper(vm::stack *Stack);
@@ -460,6 +461,22 @@ size_t signature::hash() const {
return x;
}
+size_t signature::handle() {
+ processDataStruct *P=&processData();
+ size_t h=hash();
+ for(;;) {
+ auto p=P->sigMap.find(h);
+ if(p == P->sigMap.end()) {
+ P->sigMap[h]=this;
+ return h;
+ }
+
+ if(equivalent(p->second,this))
+ return h;
+ ++h;
+ }
+}
+
trans::access *function::initializer() {
RETURN_STATIC_BLTIN(pushNullFunction);
}
diff --git a/Build/source/utils/asymptote/types.h b/Build/source/utils/asymptote/types.h
index 9492890bd20..04c3e263f21 100644
--- a/Build/source/utils/asymptote/types.h
+++ b/Build/source/utils/asymptote/types.h
@@ -62,8 +62,8 @@ typedef ty_vector::iterator ty_iterator;
// Arrays are equal if their cell types are equal.
bool equivalent(const ty *t1, const ty *t2);
-// If special is true, this is the same as above. If special is false, just the
-// signatures are compared.
+// If special is true, this is the same as above. If special is false, just
+// the signatures are compared.
bool equivalent(const ty *t1, const ty *t2, bool special);
class caster {
@@ -412,6 +412,9 @@ struct signature : public gc {
#endif
size_t hash() const;
+
+ // Return a unique handle for this signature
+ size_t handle();
};
struct function : public ty {
diff --git a/Build/source/utils/asymptote/util.cc b/Build/source/utils/asymptote/util.cc
index df33e29bff1..8cc0a76aeed 100644
--- a/Build/source/utils/asymptote/util.cc
+++ b/Build/source/utils/asymptote/util.cc
@@ -195,9 +195,9 @@ string outpath(string name)
return outdir+stripDir(name);
}
-string buildname(string name, string suffix, string aux)
+string buildname(string prefix, string suffix, string aux)
{
- name=stripExt(outpath(name),defaultformat())+aux;
+ string name=outpath(prefix)+aux;
if(!suffix.empty()) name += "."+suffix;
return name;
}
diff --git a/Build/source/utils/asymptote/v3dfile.h b/Build/source/utils/asymptote/v3dfile.h
index 4bbfdd78876..d1fa102b38a 100644
--- a/Build/source/utils/asymptote/v3dfile.h
+++ b/Build/source/utils/asymptote/v3dfile.h
@@ -20,7 +20,6 @@
#include "xstream.h"
#include "triple.h"
#include "material.h"
-#include "glrender.h"
#define transform transform_
#include "v3dtypes.h"
#undef transform
diff --git a/Build/source/utils/asymptote/v3dheadertypes.h b/Build/source/utils/asymptote/v3dheadertypes.h
index 7332e479bff..562a7c26074 100644
--- a/Build/source/utils/asymptote/v3dheadertypes.h
+++ b/Build/source/utils/asymptote/v3dheadertypes.h
@@ -1,6 +1,6 @@
// Enum class for v3dheadertypes
// AUTO-GENERATED from v3dheadertypes.csv
-// Generated at 2023-02-09 04:54:00
+// Generated at 2024-02-27 00:37:58
namespace camp
{
diff --git a/Build/source/utils/asymptote/v3dheadertypes.py b/Build/source/utils/asymptote/v3dheadertypes.py
index 2fd900ac5b9..3c527e64146 100644
--- a/Build/source/utils/asymptote/v3dheadertypes.py
+++ b/Build/source/utils/asymptote/v3dheadertypes.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python3
# Enum class for v3dheadertypes
""" AUTO-GENERATED from v3dheadertypes.csv """
-# Generated at 2023-02-09 04:54:07
+# Generated at 2024-02-27 00:38:18
class v3dheadertypes:
v3dheadertypes_canvasWidth=1
diff --git a/Build/source/utils/asymptote/v3dtypes.h b/Build/source/utils/asymptote/v3dtypes.h
index 60c00d7986a..29caad1df16 100644
--- a/Build/source/utils/asymptote/v3dtypes.h
+++ b/Build/source/utils/asymptote/v3dtypes.h
@@ -1,6 +1,6 @@
// Enum class for v3dtypes
// AUTO-GENERATED from v3dtypes.csv
-// Generated at 2023-02-09 04:54:00
+// Generated at 2024-02-27 00:37:58
namespace camp
{
diff --git a/Build/source/utils/asymptote/v3dtypes.py b/Build/source/utils/asymptote/v3dtypes.py
index ea70bf5ea99..e5c29734d1f 100644
--- a/Build/source/utils/asymptote/v3dtypes.py
+++ b/Build/source/utils/asymptote/v3dtypes.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python3
# Enum class for v3dtypes
""" AUTO-GENERATED from v3dtypes.csv """
-# Generated at 2023-02-09 04:54:07
+# Generated at 2024-02-27 00:38:18
class v3dtypes:
v3dtypes_material=1