From f77b3f025081553b4ad86d5e52b7fedd0defeada Mon Sep 17 00:00:00 2001 From: Fredrik Ekre Date: Thu, 10 Jun 2021 18:19:37 +0200 Subject: [PATCH 1/8] Update doc build dependencies. --- docs/Manifest.toml | 325 +++++++++++++++++++++++++-------------------- 1 file changed, 182 insertions(+), 143 deletions(-) diff --git a/docs/Manifest.toml b/docs/Manifest.toml index f650214..4305fcb 100644 --- a/docs/Manifest.toml +++ b/docs/Manifest.toml @@ -2,15 +2,15 @@ [[Adapt]] deps = ["LinearAlgebra"] -git-tree-sha1 = "ffcfa2d345aaee0ef3d8346a073d5dd03c983ebe" +git-tree-sha1 = "84918055d15b3114ede17ac6a7182f68870c16f7" uuid = "79e6a3ab-5dfb-504d-930d-738a2a938a0e" -version = "3.2.0" +version = "3.3.1" + +[[ArgTools]] +uuid = "0dad84c5-d112-42e6-8d28-ef12dabb789f" [[Artifacts]] -deps = ["Pkg"] -git-tree-sha1 = "c30985d8821e0cd73870b17b0ed0ce6dc44cb744" uuid = "56f22d72-fd6d-98f1-02f0-08ddc0907c33" -version = "1.3.0" [[Base64]] uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f" @@ -29,33 +29,31 @@ version = "1.16.0+6" [[ColorSchemes]] deps = ["ColorTypes", "Colors", "FixedPointNumbers", "Random", "StaticArrays"] -git-tree-sha1 = "3141757b5832ee7a0386db87997ee5a23ff20f4d" +git-tree-sha1 = "c8fd01e4b736013bc61b704871d20503b33ea402" uuid = "35d6a980-a343-548e-a6ea-1d62b119f2f4" -version = "3.10.2" +version = "3.12.1" [[ColorTypes]] deps = ["FixedPointNumbers", "Random"] -git-tree-sha1 = "32a2b8af383f11cbb65803883837a149d10dfe8a" +git-tree-sha1 = "024fe24d83e4a5bf5fc80501a314ce0d1aa35597" uuid = "3da002f7-5984-5a60-b8a6-cbb66c0b333f" -version = "0.10.12" +version = "0.11.0" [[Colors]] -deps = ["ColorTypes", "FixedPointNumbers", "InteractiveUtils", "Reexport"] -git-tree-sha1 = "ac5f2213e56ed8a34a3dd2f681f4df1166b34929" +deps = ["ColorTypes", "FixedPointNumbers", "Reexport"] +git-tree-sha1 = "417b0ed7b8b838aa6ca0a87aadf1bb9eb111ce40" uuid = "5ae59095-9a9b-59fe-a467-6f913c188581" -version = "0.12.6" +version = "0.12.8" [[Compat]] deps = ["Base64", "Dates", "DelimitedFiles", "Distributed", "InteractiveUtils", "LibGit2", "Libdl", "LinearAlgebra", "Markdown", "Mmap", "Pkg", "Printf", "REPL", "Random", "SHA", "Serialization", "SharedArrays", "Sockets", "SparseArrays", "Statistics", "Test", "UUIDs", "Unicode"] -git-tree-sha1 = "919c7f3151e79ff196add81d7f4e45d91bbf420b" +git-tree-sha1 = "e4e2b39db08f967cc1360951f01e8a75ec441cab" uuid = "34da2185-b29b-5c13-b0c7-acf172513d20" -version = "3.25.0" +version = "3.30.0" [[CompilerSupportLibraries_jll]] -deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "8e695f735fca77e9708e795eda62afdb869cbb70" +deps = ["Artifacts", "Libdl"] uuid = "e66e0078-7015-5450-92f7-15fbd957f2ae" -version = "0.3.4+0" [[Contour]] deps = ["StaticArrays"] @@ -92,19 +90,23 @@ deps = ["Random", "Serialization", "Sockets"] uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b" [[DocStringExtensions]] -deps = ["LibGit2", "Markdown", "Pkg", "Test"] -git-tree-sha1 = "50ddf44c53698f5e784bbebb3f4b21c5807401b1" +deps = ["LibGit2"] +git-tree-sha1 = "a32185f5428d3986f47c2ab78b1f216d5e6cc96f" uuid = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae" -version = "0.8.3" +version = "0.8.5" [[Documenter]] deps = ["Base64", "Dates", "DocStringExtensions", "IOCapture", "InteractiveUtils", "JSON", "LibGit2", "Logging", "Markdown", "REPL", "Test", "Unicode"] -git-tree-sha1 = "79536d7359b324b20afef3d32baaf8e3e7f4c309" +git-tree-sha1 = "1883a5b90ddd22c8527bb9e26260c379ad66f887" repo-rev = "master" repo-url = "https://github.com/JuliaDocs/Documenter.jl.git" uuid = "e30172f5-a6a5-5a46-863b-614d45cd2de4" version = "0.26.1" +[[Downloads]] +deps = ["ArgTools", "LibCURL", "NetworkOptions"] +uuid = "f43a241f-c20a-4ad4-852c-f6b1247861c6" + [[EarCut_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] git-tree-sha1 = "92d8f9f208637e8d2d28c664051a00569c01493d" @@ -113,15 +115,15 @@ version = "2.1.5+1" [[Expat_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "1402e52fcda25064f51c77a9655ce8680b76acf0" +git-tree-sha1 = "b3bfd02e98aedfa5cf885665493c5598c350cd2f" uuid = "2e619515-83b5-522b-bb60-26c02a35a201" -version = "2.2.7+6" +version = "2.2.10+0" [[FFMPEG]] -deps = ["FFMPEG_jll", "x264_jll"] -git-tree-sha1 = "9a73ffdc375be61b0e4516d83d880b265366fe1f" +deps = ["FFMPEG_jll"] +git-tree-sha1 = "b57e3acbe22f8484b4b5ff66a7499717fe1a9cc8" uuid = "c87230d0-a227-11e9-1b43-d7ebe4e7570a" -version = "0.4.0" +version = "0.4.1" [[FFMPEG_jll]] deps = ["Artifacts", "Bzip2_jll", "FreeType2_jll", "FriBidi_jll", "JLLWrappers", "LAME_jll", "LibVPX_jll", "Libdl", "Ogg_jll", "OpenSSL_jll", "Opus_jll", "Pkg", "Zlib_jll", "libass_jll", "libfdk_aac_jll", "libvorbis_jll", "x264_jll", "x265_jll"] @@ -155,56 +157,56 @@ version = "2.10.1+5" [[FriBidi_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "0d20aed5b14dd4c9a2453c1b601d08e1149679cc" +git-tree-sha1 = "aa31987c2ba8704e23c6c8ba8a4f769d5d7e4f91" uuid = "559328eb-81f9-559d-9380-de523a88c83c" -version = "1.0.5+6" +version = "1.0.10+0" [[GLFW_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Libglvnd_jll", "Pkg", "Xorg_libXcursor_jll", "Xorg_libXi_jll", "Xorg_libXinerama_jll", "Xorg_libXrandr_jll"] -git-tree-sha1 = "a1bbf700b5388bffc3d882f4f4d625cf1c714fd7" +git-tree-sha1 = "dba1e8614e98949abfa60480b13653813d8f0157" uuid = "0656b61e-2033-5cc2-a64a-77c0f6c09b89" -version = "3.3.2+1" +version = "3.3.5+0" [[GR]] -deps = ["Base64", "DelimitedFiles", "GR_jll", "HTTP", "JSON", "LinearAlgebra", "Pkg", "Printf", "Random", "Serialization", "Sockets", "Test", "UUIDs"] -git-tree-sha1 = "12d971c928b7ecf19b748a2c7df6a365690dbf2c" +deps = ["Base64", "DelimitedFiles", "GR_jll", "HTTP", "JSON", "Libdl", "LinearAlgebra", "Pkg", "Printf", "Random", "Serialization", "Sockets", "Test", "UUIDs"] +git-tree-sha1 = "b83e3125048a9c3158cbb7ca423790c7b1b57bea" uuid = "28b8d3ca-fb5f-59d9-8090-bfdbd6d07a71" -version = "0.55.0" +version = "0.57.5" [[GR_jll]] -deps = ["Artifacts", "Bzip2_jll", "Cairo_jll", "FFMPEG_jll", "Fontconfig_jll", "GLFW_jll", "JLLWrappers", "JpegTurbo_jll", "Libdl", "Libtiff_jll", "Pixman_jll", "Pkg", "Qt_jll", "Zlib_jll", "libpng_jll"] -git-tree-sha1 = "8aee6fa096b0cbdb05e71750c978b96a08c78951" +deps = ["Artifacts", "Bzip2_jll", "Cairo_jll", "FFMPEG_jll", "Fontconfig_jll", "GLFW_jll", "JLLWrappers", "JpegTurbo_jll", "Libdl", "Libtiff_jll", "Pixman_jll", "Pkg", "Qt5Base_jll", "Zlib_jll", "libpng_jll"] +git-tree-sha1 = "e14907859a1d3aee73a019e7b3c98e9e7b8b5b3e" uuid = "d2c73de3-f751-5644-a686-071e5b155ba9" -version = "0.53.0+0" +version = "0.57.3+0" [[GeometryBasics]] deps = ["EarCut_jll", "IterTools", "LinearAlgebra", "StaticArrays", "StructArrays", "Tables"] -git-tree-sha1 = "c7f81b22b6c255861be4007a16bfdeb60e1c7f9b" +git-tree-sha1 = "4136b8a5668341e58398bb472754bff4ba0456ff" uuid = "5c1252a2-5f33-56bf-86c9-59e7332b4326" -version = "0.3.11" +version = "0.3.12" [[Gettext_jll]] -deps = ["Artifacts", "JLLWrappers", "Libdl", "Libiconv_jll", "Pkg", "XML2_jll"] -git-tree-sha1 = "8c14294a079216000a0bdca5ec5a447f073ddc9d" +deps = ["Artifacts", "CompilerSupportLibraries_jll", "JLLWrappers", "Libdl", "Libiconv_jll", "Pkg", "XML2_jll"] +git-tree-sha1 = "9b02998aba7bf074d14de89f9d37ca24a1a0b046" uuid = "78b55507-aeef-58d4-861c-77aaff3498b1" -version = "0.20.1+7" +version = "0.21.0+0" [[Glib_jll]] deps = ["Artifacts", "Gettext_jll", "JLLWrappers", "Libdl", "Libffi_jll", "Libiconv_jll", "Libmount_jll", "PCRE_jll", "Pkg", "Zlib_jll"] -git-tree-sha1 = "04690cc5008b38ecbdfede949220bc7d9ba26397" +git-tree-sha1 = "47ce50b742921377301e15005c96e979574e130b" uuid = "7746bdde-850d-59dc-9ae8-88ece973131d" -version = "2.59.0+4" +version = "2.68.1+0" [[Grisu]] -git-tree-sha1 = "03d381f65183cb2d0af8b3425fde97263ce9a995" +git-tree-sha1 = "53bb909d1151e57e2484c3d1b53e19552b887fb2" uuid = "42e2da0e-8278-4e71-bc24-59509adca0fe" -version = "1.0.0" +version = "1.0.2" [[HTTP]] deps = ["Base64", "Dates", "IniFile", "MbedTLS", "NetworkOptions", "Sockets", "URIs"] -git-tree-sha1 = "c9f380c76d8aaa1fa7ea9cf97bddbc0d5b15adc2" +git-tree-sha1 = "86ed84701fbfd1142c9786f8e53c595ff5a4def9" uuid = "cd3eb016-35fb-5094-929b-558a96fad6f3" -version = "0.9.5" +version = "0.9.10" [[IOCapture]] deps = ["Logging"] @@ -233,9 +235,10 @@ uuid = "82899510-4779-5014-852e-03e436cf321d" version = "1.0.0" [[JLLWrappers]] -git-tree-sha1 = "a431f5f2ca3f4feef3bd7a5e94b8b8d4f2f647a0" +deps = ["Preferences"] +git-tree-sha1 = "642a199af8b68253517b80bd3bfd17eb4e84df6e" uuid = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210" -version = "1.2.0" +version = "1.3.0" [[JSON]] deps = ["Dates", "Mmap", "Parsers", "Unicode"] @@ -245,21 +248,21 @@ version = "0.21.1" [[JpegTurbo_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "9aff0587d9603ea0de2c6f6300d9f9492bbefbd3" +git-tree-sha1 = "d735490ac75c5cb9f1b00d8b5509c11984dc6943" uuid = "aacddb02-875f-59d6-b918-886e6ef4fbf8" -version = "2.0.1+3" +version = "2.1.0+0" [[LAME_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "df381151e871f41ee86cee4f5f6fd598b8a68826" +git-tree-sha1 = "f6250b16881adf048549549fba48b1161acdac8c" uuid = "c1c5ebd0-6772-5130-a774-d5fcae4a789d" -version = "3.100.0+3" +version = "3.100.1+0" [[LZO_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "f128cd6cd05ffd6d3df0523ed99b90ff6f9b349a" +git-tree-sha1 = "e5b909bcf985c5e2605737d2ce278ed791b89be6" uuid = "dd4b983a-f0e5-5f8d-a1b7-129d4a5fb1ac" -version = "2.10.0+3" +version = "2.10.1+0" [[LaTeXStrings]] git-tree-sha1 = "c7f1c695e06c01b95a67f0cd1d34994f3e7db104" @@ -268,34 +271,46 @@ version = "1.2.1" [[Latexify]] deps = ["Formatting", "InteractiveUtils", "LaTeXStrings", "MacroTools", "Markdown", "Printf", "Requires"] -git-tree-sha1 = "fbc08b5a78e264ba3d19da90b36ce1789ca67a40" +git-tree-sha1 = "a4b12a1bd2ebade87891ab7e36fdbce582301a92" uuid = "23fbe1c1-3f47-55db-b15f-69d7ec21a316" -version = "0.14.11" +version = "0.15.6" + +[[LibCURL]] +deps = ["LibCURL_jll", "MozillaCACerts_jll"] +uuid = "b27032c2-a3e7-50c8-80cd-2d36dbcbfd21" + +[[LibCURL_jll]] +deps = ["Artifacts", "LibSSH2_jll", "Libdl", "MbedTLS_jll", "Zlib_jll", "nghttp2_jll"] +uuid = "deac9b47-8bc7-5906-a0fe-35ac56dc84c0" [[LibGit2]] -deps = ["Printf"] +deps = ["Base64", "NetworkOptions", "Printf", "SHA"] uuid = "76f85450-5226-5b5a-8eaa-529ad045b433" +[[LibSSH2_jll]] +deps = ["Artifacts", "Libdl", "MbedTLS_jll"] +uuid = "29816b5a-b9ab-546f-933c-edad1886dfa8" + [[LibVPX_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "85fcc80c3052be96619affa2fe2e6d2da3908e11" +git-tree-sha1 = "12ee7e23fa4d18361e7c2cde8f8337d4c3101bc7" uuid = "dd192d2f-8180-539f-9fb4-cc70b1dcf69a" -version = "1.9.0+1" +version = "1.10.0+0" [[Libdl]] uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb" [[Libffi_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "a2cd088a88c0d37eef7d209fd3d8712febce0d90" +git-tree-sha1 = "761a393aeccd6aa92ec3515e428c26bf99575b3b" uuid = "e9f186c6-92d2-5b65-8a66-fee21dc1b490" -version = "3.2.1+4" +version = "3.2.2+0" [[Libgcrypt_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Libgpg_error_jll", "Pkg"] -git-tree-sha1 = "b391a18ab1170a2e568f9fb8d83bc7c780cb9999" +git-tree-sha1 = "64613c82a59c120435c067c2b809fc61cf5166ae" uuid = "d4300ac3-e22c-5743-9152-c294e39db1e4" -version = "1.8.5+4" +version = "1.8.7+0" [[Libglvnd_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libX11_jll", "Xorg_libXext_jll"] @@ -305,33 +320,33 @@ version = "1.3.0+3" [[Libgpg_error_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "ec7f2e8ad5c9fa99fc773376cdbc86d9a5a23cb7" +git-tree-sha1 = "c333716e46366857753e273ce6a69ee0945a6db9" uuid = "7add5ba3-2f88-524e-9cd5-f83b8a55f7b8" -version = "1.36.0+3" +version = "1.42.0+0" [[Libiconv_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "8e924324b2e9275a51407a4e06deb3455b1e359f" +git-tree-sha1 = "8d22e127ea9a0917bc98ebd3755c8bd31989381e" uuid = "94ce4f54-9a6c-5748-9c1c-f9c7231a4531" -version = "1.16.0+7" +version = "1.16.1+0" [[Libmount_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "51ad0c01c94c1ce48d5cad629425035ad030bfd5" +git-tree-sha1 = "9c30530bf0effd46e15e0fdcf2b8636e78cbbd73" uuid = "4b2f31a3-9ecc-558c-b454-b3730dcb73e9" -version = "2.34.0+3" +version = "2.35.0+0" [[Libtiff_jll]] deps = ["Artifacts", "JLLWrappers", "JpegTurbo_jll", "Libdl", "Pkg", "Zlib_jll", "Zstd_jll"] -git-tree-sha1 = "291dd857901f94d683973cdf679984cdf73b56d0" +git-tree-sha1 = "340e257aada13f95f98ee352d316c3bed37c8ab9" uuid = "89763e89-9b03-5906-acba-b20f662cd828" -version = "4.1.0+2" +version = "4.3.0+0" [[Libuuid_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "f879ae9edbaa2c74c922e8b85bb83cc84ea1450b" +git-tree-sha1 = "7f3efec06033682db852f8b3bc3c1d2b0a0ab066" uuid = "38a345b3-de98-5d2b-a5d3-14cd9215e700" -version = "2.34.0+7" +version = "2.36.0+0" [[LinearAlgebra]] deps = ["Libdl"] @@ -341,7 +356,7 @@ uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" deps = ["Base64", "IOCapture", "JSON", "REPL"] path = ".." uuid = "98b081ad-f1c9-55d3-8b20-4c87d4299306" -version = "2.8.0" +version = "2.8.1" [[Logging]] uuid = "56ddb016-857b-54e1-b83d-db4d58db5568" @@ -363,10 +378,8 @@ uuid = "739be429-bea8-5141-9913-cc70e7f3736d" version = "1.0.3" [[MbedTLS_jll]] -deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "0eef589dd1c26a3ac9d753fe1a8bcad63f956fa6" +deps = ["Artifacts", "Libdl"] uuid = "c8ffd9c3-330d-5841-b78e-0817d7145fa1" -version = "2.16.8+1" [[Measures]] git-tree-sha1 = "e498ddeee6f9fdb4551ce855a46f54dbd900245f" @@ -375,66 +388,67 @@ version = "0.3.1" [[Missings]] deps = ["DataAPI"] -git-tree-sha1 = "f8c673ccc215eb50fcadb285f522420e29e69e1c" +git-tree-sha1 = "4ea90bd5d3985ae1f9a908bd4500ae88921c5ce7" uuid = "e1d29d7a-bbdc-5cf2-9ac0-f12de2c33e28" -version = "0.4.5" +version = "1.0.0" [[Mmap]] uuid = "a63ad114-7e13-5084-954f-fe012c677804" +[[MozillaCACerts_jll]] +uuid = "14a3606d-f60d-562e-9121-12d972cd8159" + [[NaNMath]] git-tree-sha1 = "bfe47e760d60b82b66b61d2d44128b62e3a369fb" uuid = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3" version = "0.3.5" [[NetworkOptions]] -git-tree-sha1 = "ed3157f48a05543cce9b241e1f2815f7e843d96e" uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908" -version = "1.2.0" [[Ogg_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "a42c0f138b9ebe8b58eba2271c5053773bde52d0" +git-tree-sha1 = "7937eda4681660b4d6aeeecc2f7e1c81c8ee4e2f" uuid = "e7412a2a-1a6e-54c0-be00-318e2571c051" -version = "1.3.4+2" +version = "1.3.5+0" [[OpenSSL_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "71bbbc616a1d710879f5a1021bcba65ffba6ce58" +git-tree-sha1 = "15003dcb7d8db3c6c857fda14891a539a8f2705a" uuid = "458c3c95-2e84-50aa-8efc-19380b2a3a95" -version = "1.1.1+6" +version = "1.1.10+0" [[Opus_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "f9d57f4126c39565e05a2b0264df99f497fc6f37" +git-tree-sha1 = "51a08fb14ec28da2ec7a927c4337e4332c2a4720" uuid = "91d4177d-7536-5919-b921-800302f37372" -version = "1.3.1+3" +version = "1.3.2+0" [[OrderedCollections]] -git-tree-sha1 = "4fa2ba51070ec13fcc7517db714445b4ab986bdf" +git-tree-sha1 = "85f8e6578bf1f9ee0d11e7bb1b1456435479d47c" uuid = "bac558e1-5e72-5ebc-8fee-abe8a469f55d" -version = "1.4.0" +version = "1.4.1" [[PCRE_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "1b556ad51dceefdbf30e86ffa8f528b73c7df2bb" +git-tree-sha1 = "b2a7af664e098055a7529ad1a900ded962bca488" uuid = "2f80f16e-611a-54ab-bc61-aa92de5b98fc" -version = "8.42.0+4" +version = "8.44.0+0" [[Parsers]] deps = ["Dates"] -git-tree-sha1 = "223a825cccef2228f3fdbf2ecc7ca93363059073" +git-tree-sha1 = "c8abc88faa3f7a3950832ac5d6e690881590d6dc" uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0" -version = "1.0.16" +version = "1.1.0" [[Pixman_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "6a20a83c1ae86416f0a5de605eaea08a552844a3" +git-tree-sha1 = "b4f5d02549a10e20780a24fce72bea96b6329e29" uuid = "30392449-352a-5448-841d-b1acce4e97dc" -version = "0.40.0+0" +version = "0.40.1+0" [[Pkg]] -deps = ["Dates", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"] +deps = ["Artifacts", "Dates", "Downloads", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "Serialization", "TOML", "Tar", "UUIDs", "p7zip_jll"] uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" [[PlotThemes]] @@ -451,22 +465,28 @@ version = "1.0.10" [[Plots]] deps = ["Base64", "Contour", "Dates", "FFMPEG", "FixedPointNumbers", "GR", "GeometryBasics", "JSON", "Latexify", "LinearAlgebra", "Measures", "NaNMath", "PlotThemes", "PlotUtils", "Printf", "REPL", "Random", "RecipesBase", "RecipesPipeline", "Reexport", "Requires", "Scratch", "Showoff", "SparseArrays", "Statistics", "StatsBase", "UUIDs"] -git-tree-sha1 = "142dd04f5060c04de91cc10ca76dffb291a02426" +git-tree-sha1 = "e995fa1821b6daff8b107a8eafbec234ae2263d0" uuid = "91a5bcdd-55d7-5caf-9e0b-520d859cae80" -version = "1.10.6" +version = "1.16.5" + +[[Preferences]] +deps = ["TOML"] +git-tree-sha1 = "00cfd92944ca9c760982747e9a1d0d5d86ab1e5a" +uuid = "21216c6a-2e73-6563-6e65-726566657250" +version = "1.2.2" [[Printf]] deps = ["Unicode"] uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7" -[[Qt_jll]] +[[Qt5Base_jll]] deps = ["Artifacts", "CompilerSupportLibraries_jll", "Fontconfig_jll", "Glib_jll", "JLLWrappers", "Libdl", "Libglvnd_jll", "OpenSSL_jll", "Pkg", "Xorg_libXext_jll", "Xorg_libxcb_jll", "Xorg_xcb_util_image_jll", "Xorg_xcb_util_keysyms_jll", "Xorg_xcb_util_renderutil_jll", "Xorg_xcb_util_wm_jll", "Zlib_jll", "xkbcommon_jll"] -git-tree-sha1 = "7760cfea90bec61814e31dfb204fa4b81bba7b57" -uuid = "ede63266-ebff-546c-83e0-1c6fb6d0efc8" -version = "5.15.2+1" +git-tree-sha1 = "ad368663a5e20dbb8d6dc2fddeefe4dae0781ae8" +uuid = "ea2cea3b-5b76-57ae-a6ef-0a8af62496e1" +version = "5.15.3+0" [[REPL]] -deps = ["InteractiveUtils", "Markdown", "Sockets"] +deps = ["InteractiveUtils", "Markdown", "Sockets", "Unicode"] uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb" [[Random]] @@ -480,14 +500,14 @@ version = "1.1.1" [[RecipesPipeline]] deps = ["Dates", "NaNMath", "PlotUtils", "RecipesBase"] -git-tree-sha1 = "c4d54a78e287de7ec73bbc928ce5eb3c60f80b24" +git-tree-sha1 = "7a5026a6741c14147d1cb6daf2528a77ca28eb51" uuid = "01d81517-befc-4cb6-b9ec-a95719d0359c" -version = "0.3.1" +version = "0.3.2" [[Reexport]] -git-tree-sha1 = "57d8440b0c7d98fc4f889e478e80f268d534c9d5" +git-tree-sha1 = "5f6c21241f0f655da3952fd60aa18477cf96c220" uuid = "189a3867-3050-52da-a836-e630ba90ab69" -version = "1.0.0" +version = "1.1.0" [[Requires]] deps = ["UUIDs"] @@ -500,9 +520,9 @@ uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce" [[Scratch]] deps = ["Dates"] -git-tree-sha1 = "ad4b278adb62d185bbcb6864dc24959ab0627bf6" +git-tree-sha1 = "0b4b7f1393cff97c33891da2a0bf69c6ed241fda" uuid = "6c6a2e73-6563-6170-7368-637461726353" -version = "1.0.3" +version = "1.1.0" [[Serialization]] uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b" @@ -513,18 +533,18 @@ uuid = "1a1011a3-84de-559e-8e89-a11a2f7dc383" [[Showoff]] deps = ["Dates", "Grisu"] -git-tree-sha1 = "ee010d8f103468309b8afac4abb9be2e18ff1182" +git-tree-sha1 = "91eddf657aca81df9ae6ceb20b959ae5653ad1de" uuid = "992d4aef-0814-514b-bc4d-f2e9a6c4116f" -version = "0.3.2" +version = "1.0.3" [[Sockets]] uuid = "6462fe0b-24de-5631-8697-dd941f90decc" [[SortingAlgorithms]] -deps = ["DataStructures", "Random", "Test"] -git-tree-sha1 = "03f5898c9959f8115e30bc7226ada7d0df554ddd" +deps = ["DataStructures"] +git-tree-sha1 = "2ec1962eba973f383239da22e75218565c390a96" uuid = "a2af1166-a08f-5f64-846c-94a0d3cef48c" -version = "0.3.1" +version = "1.0.0" [[SparseArrays]] deps = ["LinearAlgebra", "Random"] @@ -532,46 +552,59 @@ uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf" [[StaticArrays]] deps = ["LinearAlgebra", "Random", "Statistics"] -git-tree-sha1 = "9da72ed50e94dbff92036da395275ed114e04d49" +git-tree-sha1 = "42378d3bab8b4f57aa1ca443821b752850592668" uuid = "90137ffa-7385-5640-81b9-e52037218182" -version = "1.0.1" +version = "1.2.2" [[Statistics]] deps = ["LinearAlgebra", "SparseArrays"] uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2" +[[StatsAPI]] +git-tree-sha1 = "1958272568dc176a1d881acb797beb909c785510" +uuid = "82ae8749-77ed-4fe6-ae5f-f523153014b0" +version = "1.0.0" + [[StatsBase]] -deps = ["DataAPI", "DataStructures", "LinearAlgebra", "Missings", "Printf", "Random", "SortingAlgorithms", "SparseArrays", "Statistics"] -git-tree-sha1 = "a83fa3021ac4c5a918582ec4721bc0cf70b495a9" +deps = ["DataAPI", "DataStructures", "LinearAlgebra", "Missings", "Printf", "Random", "SortingAlgorithms", "SparseArrays", "Statistics", "StatsAPI"] +git-tree-sha1 = "2f6792d523d7448bbe2fec99eca9218f06cc746d" uuid = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91" -version = "0.33.4" +version = "0.33.8" [[StructArrays]] deps = ["Adapt", "DataAPI", "Tables"] -git-tree-sha1 = "26ea43b4be7e919a2390c3c0f824e7eb4fc19a0a" +git-tree-sha1 = "44b3afd37b17422a62aea25f04c1f7e09ce6b07f" uuid = "09ab397b-f2b6-538f-b94a-2f83cf4a842a" -version = "0.5.0" +version = "0.5.1" + +[[TOML]] +deps = ["Dates"] +uuid = "fa267f1f-6049-4f14-aa54-33bafae1ed76" [[TableTraits]] deps = ["IteratorInterfaceExtensions"] -git-tree-sha1 = "b1ad568ba658d8cbb3b892ed5380a6f3e781a81e" +git-tree-sha1 = "c06b2f539df1c6efa794486abfb6ed2022561a39" uuid = "3783bdb8-4a98-5b6b-af9a-565f29a5fe9c" -version = "1.0.0" +version = "1.0.1" [[Tables]] deps = ["DataAPI", "DataValueInterfaces", "IteratorInterfaceExtensions", "LinearAlgebra", "TableTraits", "Test"] -git-tree-sha1 = "f03fc113290ee7726b173fc7ea661260d204b3f2" +git-tree-sha1 = "aa30f8bb63f9ff3f8303a06c604c8500a69aa791" uuid = "bd369af6-aec1-5ad0-b16a-f7cc5008161c" -version = "1.4.0" +version = "1.4.3" + +[[Tar]] +deps = ["ArgTools", "SHA"] +uuid = "a4e569a6-e804-4fa4-b0f3-eef7a1d5b13e" [[Test]] -deps = ["Distributed", "InteractiveUtils", "Logging", "Random"] +deps = ["InteractiveUtils", "Logging", "Random", "Serialization"] uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [[URIs]] -git-tree-sha1 = "7855809b88d7b16e9b029afd17880930626f54a2" +git-tree-sha1 = "97bbe755a53fe859669cd907f2d96aee8d2c1355" uuid = "5c2747f8-b7ea-4ff2-ba2e-563bfd36b1d4" -version = "1.2.0" +version = "1.3.0" [[UUIDs]] deps = ["Random", "SHA"] @@ -594,15 +627,15 @@ version = "1.18.0+4" [[XML2_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Libiconv_jll", "Pkg", "Zlib_jll"] -git-tree-sha1 = "be0db24f70aae7e2b89f2f3092e93b8606d659a6" +git-tree-sha1 = "1acf5bdf07aa0907e0a37d3718bb88d4b687b74a" uuid = "02c8fc9c-b97f-50b9-bbe4-9be30ff0a78a" -version = "2.9.10+3" +version = "2.9.12+0" [[XSLT_jll]] -deps = ["Artifacts", "JLLWrappers", "Libdl", "Libgcrypt_jll", "Pkg", "XML2_jll"] -git-tree-sha1 = "2b3eac39df218762d2d005702d601cd44c997497" +deps = ["Artifacts", "JLLWrappers", "Libdl", "Libgcrypt_jll", "Libgpg_error_jll", "Libiconv_jll", "Pkg", "XML2_jll", "Zlib_jll"] +git-tree-sha1 = "91844873c4085240b95e795f692c4cec4d805f8a" uuid = "aed1982a-8fda-507f-9586-7b0439959a61" -version = "1.1.33+4" +version = "1.1.34+0" [[Xorg_libX11_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Xorg_libxcb_jll", "Xorg_xtrans_jll"] @@ -731,16 +764,14 @@ uuid = "c5fb5394-a638-5e4d-96e5-b29de1b5cf10" version = "1.4.0+3" [[Zlib_jll]] -deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "320228915c8debb12cb434c59057290f0834dbf6" +deps = ["Libdl"] uuid = "83775a58-1f1d-513f-b197-d71354ab007a" -version = "1.2.11+18" [[Zstd_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "2c1332c54931e83f8f94d310fa447fd743e8d600" +git-tree-sha1 = "cc4bf3fdde8b7e3e9fa0351bdeedba1cf3b7f6e6" uuid = "3161d3a3-bdf6-5164-811a-617609db77b4" -version = "1.4.8+0" +version = "1.5.0+0" [[libass_jll]] deps = ["Artifacts", "Bzip2_jll", "FreeType2_jll", "FriBidi_jll", "JLLWrappers", "Libdl", "Pkg", "Zlib_jll"] @@ -756,15 +787,23 @@ version = "0.1.6+4" [[libpng_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg", "Zlib_jll"] -git-tree-sha1 = "6abbc424248097d69c0c87ba50fcb0753f93e0ee" +git-tree-sha1 = "94d180a6d2b5e55e447e2d27a29ed04fe79eb30c" uuid = "b53b4c65-9356-5827-b1ea-8c7a1a84506f" -version = "1.6.37+6" +version = "1.6.38+0" [[libvorbis_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Ogg_jll", "Pkg"] -git-tree-sha1 = "fa14ac25af7a4b8a7f61b287a124df7aab601bcd" +git-tree-sha1 = "c45f4e40e7aafe9d086379e5578947ec8b95a8fb" uuid = "f27f6e37-5d2b-51aa-960f-b287f2bc3b7a" -version = "1.3.6+6" +version = "1.3.7+0" + +[[nghttp2_jll]] +deps = ["Artifacts", "Libdl"] +uuid = "8e850ede-7688-5339-a07c-302acd2aaf8d" + +[[p7zip_jll]] +deps = ["Artifacts", "Libdl"] +uuid = "3f19e933-33d8-53b3-aaab-bd5110c3b7a0" [[x264_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] From 7e0f66780fcb05f3c8384e70d7755b8529f7a1d3 Mon Sep 17 00:00:00 2001 From: Fredrik Ekre Date: Thu, 10 Jun 2021 18:53:47 +0200 Subject: [PATCH 2/8] Add versions kwarg to deploydocs. --- docs/make.jl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/make.jl b/docs/make.jl index 7610152..bb7d403 100644 --- a/docs/make.jl +++ b/docs/make.jl @@ -66,6 +66,7 @@ makedocs( deploydocs( repo = "github.com/fredrikekre/Literate.jl.git", - push_preview=true, + push_preview = true, + versions = ["v#.#", "dev" => "dev"], deploy_config = deployconfig, ) From 512e4823c0fb73a9470c2fea71110676266305d7 Mon Sep 17 00:00:00 2001 From: Fredrik Ekre Date: Thu, 10 Jun 2021 20:38:29 +0200 Subject: [PATCH 3/8] include v2 in versions array to deploydocs --- docs/make.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/make.jl b/docs/make.jl index bb7d403..f397f38 100644 --- a/docs/make.jl +++ b/docs/make.jl @@ -67,6 +67,6 @@ makedocs( deploydocs( repo = "github.com/fredrikekre/Literate.jl.git", push_preview = true, - versions = ["v#.#", "dev" => "dev"], + versions = ["v2" => "v^", "v#.#", "dev" => "dev"], deploy_config = deployconfig, ) From 9184313a445b453380a970a3f0c55867d3df52d3 Mon Sep 17 00:00:00 2001 From: Fredrik Ekre Date: Thu, 17 Jun 2021 10:20:13 +0200 Subject: [PATCH 4/8] Update to Documenter 0.27.1. --- docs/Manifest.toml | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/docs/Manifest.toml b/docs/Manifest.toml index 4305fcb..ca9480d 100644 --- a/docs/Manifest.toml +++ b/docs/Manifest.toml @@ -97,11 +97,9 @@ version = "0.8.5" [[Documenter]] deps = ["Base64", "Dates", "DocStringExtensions", "IOCapture", "InteractiveUtils", "JSON", "LibGit2", "Logging", "Markdown", "REPL", "Test", "Unicode"] -git-tree-sha1 = "1883a5b90ddd22c8527bb9e26260c379ad66f887" -repo-rev = "master" -repo-url = "https://github.com/JuliaDocs/Documenter.jl.git" +git-tree-sha1 = "182d1b454955cd2f2e1d38eab3431cdd8f7e9096" uuid = "e30172f5-a6a5-5a46-863b-614d45cd2de4" -version = "0.26.1" +version = "0.27.1" [[Downloads]] deps = ["ArgTools", "LibCURL", "NetworkOptions"] @@ -209,10 +207,10 @@ uuid = "cd3eb016-35fb-5094-929b-558a96fad6f3" version = "0.9.10" [[IOCapture]] -deps = ["Logging"] -git-tree-sha1 = "1868e4e7ad2f93d8de0904d89368c527b46aa6a1" +deps = ["Logging", "Random"] +git-tree-sha1 = "f7be53659ab06ddc986428d3a9dcc95f6fa6705a" uuid = "b5f81e59-6552-4d32-b1f0-c071b021bf89" -version = "0.2.1" +version = "0.2.2" [[IniFile]] deps = ["Test"] @@ -326,9 +324,9 @@ version = "1.42.0+0" [[Libiconv_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] -git-tree-sha1 = "8d22e127ea9a0917bc98ebd3755c8bd31989381e" +git-tree-sha1 = "42b62845d70a619f063a7da093d995ec8e15e778" uuid = "94ce4f54-9a6c-5748-9c1c-f9c7231a4531" -version = "1.16.1+0" +version = "1.16.1+1" [[Libmount_jll]] deps = ["Artifacts", "JLLWrappers", "Libdl", "Pkg"] From 110bf7156918a28d96ebb90c1334ab2b6ee21368 Mon Sep 17 00:00:00 2001 From: Fredrik Ekre Date: Thu, 17 Jun 2021 10:30:05 +0200 Subject: [PATCH 5/8] Set GKSwstype for silencing GR warnings. --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0b6bbb5..7373e35 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -50,4 +50,5 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }} + GKSwstype: '100' run: julia --project=docs --color=yes docs/make.jl From 8d8caac6e651eb02ded5699835384d0f0b139e78 Mon Sep 17 00:00:00 2001 From: Fredrik Ekre Date: Fri, 18 Jun 2021 12:45:13 +0200 Subject: [PATCH 6/8] Update to Documenter 0.27.2. --- docs/Manifest.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/Manifest.toml b/docs/Manifest.toml index ca9480d..21bc3d8 100644 --- a/docs/Manifest.toml +++ b/docs/Manifest.toml @@ -97,9 +97,9 @@ version = "0.8.5" [[Documenter]] deps = ["Base64", "Dates", "DocStringExtensions", "IOCapture", "InteractiveUtils", "JSON", "LibGit2", "Logging", "Markdown", "REPL", "Test", "Unicode"] -git-tree-sha1 = "182d1b454955cd2f2e1d38eab3431cdd8f7e9096" +git-tree-sha1 = "621850838b3e74dd6dd047b5432d2e976877104e" uuid = "e30172f5-a6a5-5a46-863b-614d45cd2de4" -version = "0.27.1" +version = "0.27.2" [[Downloads]] deps = ["ArgTools", "LibCURL", "NetworkOptions"] From d561b540e3fb601e63a951671356e71d4389c5f2 Mon Sep 17 00:00:00 2001 From: st-- Date: Wed, 30 Jun 2021 02:21:51 +0300 Subject: [PATCH 7/8] include inputfile in errors (#150) --- src/Literate.jl | 16 ++++++++-------- test/runtests.jl | 5 +++-- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/Literate.jl b/src/Literate.jl index bb6ef16..900cdd9 100644 --- a/src/Literate.jl +++ b/src/Literate.jl @@ -458,7 +458,7 @@ function markdown(inputfile, outputdir=pwd(); config::Dict=Dict(), kwargs...) write_code = !(all(l -> endswith(l, "#hide"), chunk.lines) && !(config["documenter"]::Bool)) write_code && write(iomd, seekstart(iocode)) if config["execute"]::Bool - execute_markdown!(iomd, sb, join(chunk.lines, '\n'), outputdir) + execute_markdown!(iomd, sb, join(chunk.lines, '\n'), outputdir; inputfile=config["literate_inputfile"]) end end write(iomd, '\n') # add a newline between each chunk @@ -472,9 +472,9 @@ function markdown(inputfile, outputdir=pwd(); config::Dict=Dict(), kwargs...) return outputfile end -function execute_markdown!(io::IO, sb::Module, block::String, outputdir) +function execute_markdown!(io::IO, sb::Module, block::String, outputdir; inputfile::String="") # TODO: Deal with explicit display(...) calls - r, str, _ = execute_block(sb, block) + r, str, _ = execute_block(sb, block; inputfile=inputfile) plain_fence = "\n```\n" => "\n```" # issue #101: consecutive codefenced blocks need newline if r !== nothing && !REPL.ends_with_semicolon(block) for (mime, ext) in [(MIME("image/png"), ".png"), (MIME("image/jpeg"), ".jpeg")] @@ -601,7 +601,7 @@ function jupyter_notebook(chunks, config) @info "executing notebook `$(config["name"] * ".ipynb")`" try cd(config["literate_outputdir"]) do - nb = execute_notebook(nb) + nb = execute_notebook(nb; inputfile=config["literate_inputfile"]) end catch err @error "error when executing notebook based on input file: " * @@ -612,7 +612,7 @@ function jupyter_notebook(chunks, config) return nb end -function execute_notebook(nb) +function execute_notebook(nb; inputfile::String="") sb = sandbox() execution_count = 0 for cell in nb["cells"] @@ -620,7 +620,7 @@ function execute_notebook(nb) execution_count += 1 cell["execution_count"] = execution_count block = join(cell["source"]) - r, str, display_dicts = execute_block(sb, block) + r, str, display_dicts = execute_block(sb, block; inputfile=inputfile) # str should go into stream if !isempty(str) @@ -702,7 +702,7 @@ function Base.display(ld::LiterateDisplay, mime::MIME, x) end # Execute a code-block in a module and capture stdout/stderr and the result -function execute_block(sb::Module, block::String) +function execute_block(sb::Module, block::String; inputfile::String="") @debug """execute_block($sb, block) ``` $(block) @@ -724,7 +724,7 @@ function execute_block(sb::Module, block::String) if c.error error(""" $(sprint(showerror, c.value)) - when executing the following code block + when executing the following code block in file `$(Base.contractuser(inputfile))` ```julia $block diff --git a/test/runtests.jl b/test/runtests.jl index 0854671..3e7808c 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -1038,14 +1038,15 @@ end end # test error when executing notebook write(inputfile, "for i in 1:10\n println(i)") - r = @test_logs((:error, r"error when executing"), match_mode=:any, + r = @test_logs((:error, r"error when executing notebook based on input file: "), match_mode=:any, try Literate.notebook(inputfile, outdir) catch err err end) @test isa(r, ErrorException) - @test occursin("when executing the following code block", r.msg) + @test occursin("when executing the following code block in file ", r.msg) + @test occursin(inputfile, r.msg) # verify that inputfile exists @test_throws ArgumentError Literate.notebook("nonexistent.jl", outdir) From 82e27580c969e06bb6f157aa8d447ca9f56eef62 Mon Sep 17 00:00:00 2001 From: Vaverka <47707103+jvaverka@users.noreply.github.com> Date: Tue, 6 Jul 2021 11:31:19 -0400 Subject: [PATCH 8/8] [doc] fix some typos in documentation (#154) --- docs/src/customprocessing.md | 2 +- docs/src/fileformat.md | 4 ++-- docs/src/index.md | 4 ++-- docs/src/outputformats.md | 6 +++--- docs/src/tips.md | 2 +- examples/example.jl | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/src/customprocessing.md b/docs/src/customprocessing.md index 7fd6924..c2e8f3d 100644 --- a/docs/src/customprocessing.md +++ b/docs/src/customprocessing.md @@ -10,7 +10,7 @@ is done by letting the user supply custom pre- and post-processing functions that may do transformation of the content. All of the generators ([`Literate.markdown`](@ref), [`Literate.notebook`](@ref) -and [`Literate.script`](@ref)) accepts `preprocess` and `postprocess` keyword +and [`Literate.script`](@ref)) accept `preprocess` and `postprocess` keyword arguments. The default "transformation" is the `identity` function. The input to the transformation functions is a `String`, and the output should be the transformed `String`. diff --git a/docs/src/fileformat.md b/docs/src/fileformat.md index d9eefa4..481f679 100644 --- a/docs/src/fileformat.md +++ b/docs/src/fileformat.md @@ -12,7 +12,7 @@ The basic syntax is simple: - all other lines are treated as julia code. Leading whitespace is allowed before `#`, but it will be removed when generating the -output. Since `#`-lines is treated as markdown we can not use that for regular julia +output. Since `#`-lines are treated as markdown we can not use that for regular julia comments, for this you can instead use `## `, which will render as `# ` in the output. Lets look at a simple example: @@ -113,7 +113,7 @@ is a case where we can prepend `#md` to those lines: #md # ``` ```` The lines in the example above would be filtered out in the preprocessing step, unless we are -generating a markdown file. When generating a markdown file we would simple remove +generating a markdown file. When generating a markdown file we would simply remove the leading `#md ` from the lines. Beware that the space after the tag is also removed. The `#src` token can also be placed at the *end* of a line. This is to make it possible diff --git a/docs/src/index.md b/docs/src/index.md index 58771eb..f9f3761 100644 --- a/docs/src/index.md +++ b/docs/src/index.md @@ -29,8 +29,8 @@ Examples are (probably) the best way to showcase your awesome package, and examp are often the best way for a new user to learn how to use it. It is therefore important that the documentation of your package contains examples for users to read and study. However, people are different, and we all prefer different ways of trying out a new -package. Some people wants to RTFM, others want to explore the package interactively in, -for example, a notebook, and some people wants to study the source code. The aim of +package. Some people want to RTFM, others want to explore the package interactively in, +for example, a notebook, and some people want to study the source code. The aim of Literate is to make it easy to give the user all of these options, while still keeping maintenance to a minimum. diff --git a/docs/src/outputformats.md b/docs/src/outputformats.md index 939b861..9bd73b8 100644 --- a/docs/src/outputformats.md +++ b/docs/src/outputformats.md @@ -1,6 +1,6 @@ # [**4.** Output Formats](@id Output-Formats) -When the source is parsed, and have been processed it is time to render the output. +When the source is parsed, and has been processed it is time to render the output. We will consider the following source snippet: ```@eval @@ -143,10 +143,10 @@ keyword arguments. Passing configuration as a dictionary requires at least Literate version 2.2. !!! note "Configuration precedence" - Individual keyword arguments takes precedence over the `config` dictionary, so for e.g. + Individual keyword arguments take precedence over the `config` dictionary, so for e.g. `Literate.markdown(...; config = Dict("name" => "hello"), name = "world")` the resulting configuration for `name` will be `"world"`. Both individual keyword arguments - and the `config` dictionary takes precedence over the default. + and the `config` dictionary take precedence over the default. Available configurations with description and default values are given in the reference for [`Literate.DEFAULT_CONFIGURATION`](@ref) just below. diff --git a/docs/src/tips.md b/docs/src/tips.md index 83201d7..e9bde80 100644 --- a/docs/src/tips.md +++ b/docs/src/tips.md @@ -19,7 +19,7 @@ the generated notebook can become large. In order to remedy this you can use the clever Julia package [`DisplayAs`](https://github.com/tkf/DisplayAs.jl) to limit the output capabilities of -and object. For example, to "force" an image to be captures as `image/png` only, +an object. For example, to "force" an image to be captures as `image/png` only, you can use ```julia diff --git a/examples/example.jl b/examples/example.jl index 70ede00..9c5a5a5 100644 --- a/examples/example.jl +++ b/examples/example.jl @@ -8,7 +8,7 @@ # This is an example generated with Literate based on this # source file: [`example.jl`](@__REPO_ROOT_URL__/examples/example.jl). # You are seeing the -#md # HTML-output which Documenter have generated based on a markdown +#md # HTML-output which Documenter has generated based on a markdown #md # file generated with Literate. The corresponding notebook #md # can be viewed in [nbviewer](http://nbviewer.jupyter.org/) here: #md # [`example.ipynb`](@__NBVIEWER_ROOT_URL__/generated/example.ipynb),