diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 139a59cd..5ba85728 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -34,7 +34,7 @@ jobs: run: cargo build --release --all-features - name: rename output run: mv target/release/tex-match ./tex-match.linux.amd64 - - uses: actions/upload-artifact@v2.1.4 + - uses: actions/upload-artifact@v2.2.0 with: name: tex-match.linux.amd64 path: ./tex-match.linux.amd64 @@ -94,7 +94,7 @@ jobs: - name: build run: cargo wix -v --nocapture -o tex-match.windows.msi # upload - - uses: actions/upload-artifact@v2.1.4 + - uses: actions/upload-artifact@v2.2.0 with: name: tex-match.windows.msi path: ./tex-match.windows.msi @@ -123,7 +123,7 @@ jobs: run: cargo build --release --all-features - name: rename output run: mv target/release/tex-match ./tex-match.macos - - uses: actions/upload-artifact@v2.1.4 + - uses: actions/upload-artifact@v2.2.0 with: name: tex-match.macos path: ./tex-match.macos @@ -148,7 +148,7 @@ jobs: release: stable - name: rename output run: mv ${{ steps.snapcraft.outputs.snap }} ./tex-match.snap - - uses: actions/upload-artifact@v2.1.4 + - uses: actions/upload-artifact@v2.2.0 with: name: tex-match.snap path: ./tex-match.snap @@ -177,7 +177,7 @@ jobs: run: sudo flatpak-builder --repo=repo build-dir flatpak/uk.co.mrbenshef.TeX-Match.json - name: Flatpak build bundle run: flatpak build-bundle ./repo tex-match.flatpak uk.co.mrbenshef.TeX-Match - - uses: actions/upload-artifact@v2.1.4 + - uses: actions/upload-artifact@v2.2.0 with: name: tex-match.flatpak path: ./tex-match.flatpak diff --git a/Cargo.lock b/Cargo.lock index 42b6ed55..3c25e898 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,18 +2,18 @@ # It is not intended for manual editing. [[package]] name = "aho-corasick" -version = "0.7.13" +version = "0.7.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "043164d8ba5c4c3035fec9bbee8647c0261d788f3474306f93bb65901cae0e86" +checksum = "b476ce7103678b0c6d3d395dbbae31d48ff910bd28be979ba5d48c6351131d0d" dependencies = [ "memchr", ] [[package]] name = "anyhow" -version = "1.0.32" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b602bfe940d21c130f3895acd65221e8a61270debe89d628b9cb4e3ccb8569b" +checksum = "a1fd36ffbb1fb7c834eac128ea8d0e310c5aeb635548f9d58861e1308d46e71c" [[package]] name = "atk" @@ -64,6 +64,12 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" +[[package]] +name = "base64" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" + [[package]] name = "bitflags" version = "1.2.1" @@ -98,9 +104,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.60" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef611cc68ff783f18535d77ddd080185275713d852c4f5cbb6122c462a7a825c" +checksum = "ed67cbde08356238e75fc4656be4749481eeffb09e19f320a25237d5221c985d" [[package]] name = "cfg-if" @@ -108,85 +114,13 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" -[[package]] -name = "crossbeam" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69323bff1fb41c635347b8ead484a5ca6c3f11914d784170b158d8449ab07f8e" -dependencies = [ - "cfg-if", - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-epoch", - "crossbeam-queue", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-channel" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87" -dependencies = [ - "crossbeam-utils", - "maybe-uninit", -] - -[[package]] -name = "crossbeam-deque" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285" -dependencies = [ - "crossbeam-epoch", - "crossbeam-utils", - "maybe-uninit", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" -dependencies = [ - "autocfg", - "cfg-if", - "crossbeam-utils", - "lazy_static", - "maybe-uninit", - "memoffset", - "scopeguard", -] - -[[package]] -name = "crossbeam-queue" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570" -dependencies = [ - "cfg-if", - "crossbeam-utils", - "maybe-uninit", -] - -[[package]] -name = "crossbeam-utils" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" -dependencies = [ - "autocfg", - "cfg-if", - "lazy_static", -] - [[package]] name = "detexify" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c817553a2e693dae195dadd36c65d78bc282511797e7a5b7b3e425e0be703d0" dependencies = [ - "base64", + "base64 0.12.3", "itertools 0.9.0", "phf", "phf_codegen", @@ -211,9 +145,9 @@ checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" [[package]] name = "env_logger" -version = "0.7.1" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" +checksum = "54532e3223c5af90a6a757c90b5c5521564b07e5e7a958681bcd2afad421cdcd" dependencies = [ "atty", "humantime", @@ -230,9 +164,9 @@ checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394" [[package]] name = "futures" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e05b85ec287aac0dc34db7d4a569323df697f9c55b99b15d6b4ef8cde49f613" +checksum = "95314d38584ffbfda215621d723e0a3906f032e03ae5551e650058dac83d4797" dependencies = [ "futures-channel", "futures-core", @@ -245,9 +179,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f366ad74c28cca6ba456d95e6422883cfb4b252a83bed929c83abfdbbf2967d5" +checksum = "0448174b01148032eed37ac4aed28963aaaa8cfa93569a08e5b479bbc6c2c151" dependencies = [ "futures-core", "futures-sink", @@ -255,15 +189,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59f5fff90fd5d971f936ad674802482ba441b6f09ba5e15fd8b39145582ca399" +checksum = "18eaa56102984bed2c88ea39026cff3ce3b4c7f508ca970cedf2450ea10d4e46" [[package]] name = "futures-executor" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10d6bb888be1153d3abeb9006b11b02cf5e9b209fda28693c31ae1e4e012e314" +checksum = "f5f8e0c9258abaea85e78ebdda17ef9666d390e987f006be6080dfe354b708cb" dependencies = [ "futures-core", "futures-task", @@ -272,15 +206,15 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de27142b013a8e869c14957e6d2edeef89e97c289e69d042ee3a49acd8b51789" +checksum = "6e1798854a4727ff944a7b12aa999f58ce7aa81db80d2dfaaf2ba06f065ddd2b" [[package]] name = "futures-macro" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0b5a30a4328ab5473878237c447333c093297bded83a4983d10f4deea240d39" +checksum = "e36fccf3fc58563b4a14d265027c627c3b665d7fed489427e88e7cc929559efe" dependencies = [ "proc-macro-hack", "proc-macro2", @@ -290,24 +224,24 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f2032893cb734c7a05d85ce0cc8b8c4075278e93b24b66f9de99d6eb0fa8acc" +checksum = "0e3ca3f17d6e8804ae5d3df7a7d35b2b3a6fe89dac84b31872720fc3060a0b11" [[package]] name = "futures-task" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdb66b5f09e22019b1ab0830f7785bcea8e7a42148683f99214f73f8ec21a626" +checksum = "96d502af37186c4fef99453df03e374683f8a1eec9dcc1e66b3b82dc8278ce3c" dependencies = [ "once_cell", ] [[package]] name = "futures-util" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8764574ff08b701a084482c3c7031349104b07ac897393010494beaa18ce32c6" +checksum = "abcb44342f62e6f3e8ac427b8aa815f724fd705dfad060b18ac7866c15bb8e34" dependencies = [ "futures-channel", "futures-core", @@ -455,9 +389,9 @@ dependencies = [ [[package]] name = "glib" -version = "0.10.2" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f11a45bde4cf9567653a14ff96cdbb01e6d2a89651746dbc118319dfdac433e" +checksum = "0c685013b7515e668f1b57a165b009d4d28cb139a8a989bbd699c10dad29d0c5" dependencies = [ "bitflags", "futures-channel", @@ -566,21 +500,18 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.1.15" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9" +checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8" dependencies = [ "libc", ] [[package]] name = "humantime" -version = "1.3.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" -dependencies = [ - "quick-error", -] +checksum = "3c1ad908cc71012b7bea4d0c53ba96a8cba9962f048fa68d143376143d863b7a" [[package]] name = "itertools" @@ -614,9 +545,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.77" +version = "0.2.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2f96b10ec2560088a8e76961b00d47107b3a625fecb76dedb29ee7ccbf98235" +checksum = "4d58d1b70b004888f764dfbf6a26a3b0342a1632d33968e4a179d8011c760614" [[package]] name = "linked-hash-map" @@ -633,26 +564,11 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "maybe-uninit" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" - [[package]] name = "memchr" -version = "2.3.3" +version = "2.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" - -[[package]] -name = "memoffset" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c198b026e1bbf08a937e94c6c60f9ec4a2267f5b0d2eec9c1b21b061ce2be55f" -dependencies = [ - "autocfg", -] +checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" [[package]] name = "num-traits" @@ -660,14 +576,14 @@ version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31" dependencies = [ - "num-traits 0.2.12", + "num-traits 0.2.14", ] [[package]] name = "num-traits" -version = "0.2.12" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611" +checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" dependencies = [ "autocfg", ] @@ -745,18 +661,18 @@ dependencies = [ [[package]] name = "pin-project" -version = "0.4.23" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca4433fff2ae79342e497d9f8ee990d174071408f28f726d6d83af93e58e48aa" +checksum = "ee41d838744f60d959d7074e3afb6b35c7456d0f61cad38a24e35e6553f73841" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "0.4.23" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c0e815c3ee9a031fdf5af21c10aa17c573c9c6a566328d99e3936c34e36461f" +checksum = "81a4ffa594b66bff340084d4081df649a7dc049ac8d7fc458d8e628bfbbb2f86" dependencies = [ "proc-macro2", "quote", @@ -771,9 +687,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.18" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d36492546b6af1463394d46f0c834346f31548646f6ba10849802c9c9a27ac33" +checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c" [[package]] name = "ppv-lite86" @@ -816,9 +732,9 @@ dependencies = [ [[package]] name = "proc-macro-hack" -version = "0.5.18" +version = "0.5.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99c605b9a0adc77b7211c6b1f722dcb613d68d66859a44f3d485a6da332b0598" +checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" [[package]] name = "proc-macro-nested" @@ -828,19 +744,13 @@ checksum = "eba180dafb9038b050a4c280019bbedf9f2467b61e5d892dcad585bb57aadc5a" [[package]] name = "proc-macro2" -version = "1.0.21" +version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36e28516df94f3dd551a587da5357459d9b36d945a7c37c3557928c1c2ff2a2c" +checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71" dependencies = [ "unicode-xid", ] -[[package]] -name = "quick-error" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" - [[package]] name = "quote" version = "1.0.7" @@ -903,9 +813,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.3.9" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6" +checksum = "8963b85b8ce3074fecffde43b4b0dded83ce2f367dc8d363afc56679f3ee820b" dependencies = [ "aho-corasick", "memchr", @@ -915,47 +825,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8" - -[[package]] -name = "rust-embed" -version = "5.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213acf1bc5a6dfcd70b62db1e9a7d06325c0e73439c312fcb8599d456d9686ee" -dependencies = [ - "rust-embed-impl", - "rust-embed-utils", - "walkdir", -] - -[[package]] -name = "rust-embed-impl" -version = "5.6.0" +version = "0.6.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7903c2cf599db8f310b392332f38367ca4acc84420fa1aee3536299f433c10d5" -dependencies = [ - "quote", - "rust-embed-utils", - "syn", - "walkdir", -] - -[[package]] -name = "rust-embed-utils" -version = "5.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97655158074ccb2d2cfb1ccb4c956ef0f4054e43a2c1e71146d4991e6961e105" -dependencies = [ - "walkdir", -] - -[[package]] -name = "ryu" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b96a9549dc8d48f2c283938303c4b5a77aa29bfbc5b54b084fb1630408899a8f" +checksum = "8cab7a364d15cde1e505267766a2d3c4e22a843e1a601f0fa7564c0f82ced11c" [[package]] name = "ryu" @@ -963,35 +835,20 @@ version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - [[package]] name = "serde" -version = "1.0.116" +version = "1.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96fe57af81d28386a513cbc6858332abc6117cfdb5999647c6444b8f43a370a5" +checksum = "b88fa983de7720629c9387e9f517353ed404164b1e482c970a90c1a4aaf7dc1a" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.116" +version = "1.0.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f630a6370fd8e457873b4bd2ffdae75408bc291ba72be773772a4c2a065d9ae8" +checksum = "cbd1ae72adb44aab48f325a02444a5fc079349a8d804c1fc922aed3f7454c74e" dependencies = [ "proc-macro2", "quote", @@ -1000,23 +857,12 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.57" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "164eacbdb13512ec2745fb09d51fd5b22b0d65ed294a1dcf7285a360c80a675c" +checksum = "dcac07dbffa1c65e7f816ab9eba78eb142c6d44410f4eeba1e26e4f5dfa56b95" dependencies = [ "itoa", - "ryu 1.0.5", - "serde", -] - -[[package]] -name = "serde_jsonrc" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b591e90bcce7185aa4f8c775c504456586ae0f7df49a4087a1ee4179d402b8a8" -dependencies = [ - "itoa", - "ryu 0.2.8", + "ryu", "serde", ] @@ -1077,9 +923,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.41" +version = "1.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6690e3e9f692504b941dc6c3b188fd28df054f7fb8469ab40680df52fdcc842b" +checksum = "cc371affeffc477f42a221a1e4297aedcea33d47d19b61455588bd9d8f6b19ac" dependencies = [ "proc-macro2", "quote", @@ -1112,11 +958,10 @@ dependencies = [ [[package]] name = "tex-match" -version = "1.0.1" +version = "1.1.0" dependencies = [ - "base64", + "base64 0.13.0", "cairo-rs", - "crossbeam", "detexify", "dirty2", "env_logger", @@ -1129,12 +974,8 @@ dependencies = [ "glib", "gtk", "itertools 0.9.0", - "lazy_static", "log", "pango", - "rust-embed", - "serde", - "serde_jsonrc", "shrinkwraprs", "simple-error", "single_value_channel", @@ -1143,18 +984,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.20" +version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dfdd070ccd8ccb78f4ad66bf1982dc37f620ef696c6b5028fe2ed83dd3d0d08" +checksum = "318234ffa22e0920fe9a40d7b8369b5f649d490980cf7aadcf1eb91594869b42" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.20" +version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd80fc12f73063ac132ac92aceea36734f04a1d93c1240c6944e23a3b8841793" +checksum = "cae2447b6282786c3493999f40a9be2a6ad20cb8bd268b0a0dbf5a065535c0ab" dependencies = [ "proc-macro2", "quote", @@ -1172,9 +1013,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a" +checksum = "75cf45bb0bef80604d001caaec0d09da99611b3c0fd39d3080468875cdb65645" dependencies = [ "serde", ] @@ -1213,17 +1054,6 @@ version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed" -[[package]] -name = "walkdir" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d" -dependencies = [ - "same-file", - "winapi", - "winapi-util", -] - [[package]] name = "wasi" version = "0.9.0+wasi-snapshot-preview1" diff --git a/Cargo.toml b/Cargo.toml index 2acac106..d974a2f7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tex-match" -version = "1.0.1" +version = "1.1.0" authors = ["Ben Sheffield "] edition = "2018" description = """Search through over 1000 different LaTeX symbols by sketching""" @@ -31,22 +31,16 @@ cairo-rs = "0.9" gladis = "0.4.1" gladis_proc_macro = "0.4.1" shrinkwraprs = "0.3.0" -# JSON -serde = { version = "1.0", features = ["derive"] } -serde_jsonrc = "0.1" # Logging log = "0.4.11" -env_logger = "0.7.1" +env_logger = "0.8.1" # TeX classification detexify = "0.3.0" # Misc utils -lazy_static = "1.4.0" -rust-embed = { version = "5.6.0", features = ["debug-embed"] } dirty2 = "0.1.0" simple-error = "0.2" -crossbeam = "0.7.3" itertools = "0.9.0" -base64 = "0.12.3" +base64 = "0.13.0" single_value_channel = "1.2.1" [dependencies.gtk] diff --git a/README.md b/README.md index c5736225..832fb368 100644 --- a/README.md +++ b/README.md @@ -11,9 +11,8 @@ ![Continuous integration](https://github.com/mrbenshef/TeX-Match/workflows/Continuous%20integration/badge.svg) ![Release](https://github.com/mrbenshef/TeX-Match/workflows/Release/badge.svg?branch=release) [![Crates.io](https://img.shields.io/crates/v/tex-match)](https://crates.io/crates/tex-match) - ### What is TeX Match? @@ -25,11 +24,51 @@ If you work with LaTeX, you know its difficult to memorize the names of all the - Completely offline - Crossplatform +### Screenshots + +| Adwaita | Adwaita-Dark | +| :---: | :---: | +| ![light](screenshots/light.png) | ![dark](screenshots/dark.png) | + ### Get Tex Match -| Linux | Windows | MacOS | -| :--- | :--- | :--- | -| [tex-match.linux.amd64](https://github.com/mrbenshef/TeX-Match/releases/latest/download/tex-match.linux.amd64)
[tex-match.flatpak](https://github.com/mrbenshef/TeX-Match/releases/latest/download/tex-match.flatpak)
[tex-match.snap](https://github.com/mrbenshef/TeX-Match/releases/latest/download/tex-match.snap) | [tex-match.windows.msi](https://github.com/mrbenshef/TeX-Match/releases/latest/download/tex-match.windows.msi) | You should really use the [detexify Mac app](https://gum.co/detexify),
but if you _really_ want to:
[tex-match.macos](https://github.com/mrbenshef/TeX-Match/releases/latest/download/tex-match.macos) | + + + + + + + + + + + +
LinuxWindowsMacOS
+ tex-match.linux.amd64 +
+ tex-match.flatpak +
+ tex-match.snap +
+ Get it from the Snap Store +
+ Download on Flathub +
+ tex-match.windows.msi + + You should really use the detexify Mac app, +
+
+ but if you really want to: +
+ tex-match.macos +
Check out my other project, [Boop-GTK](https://github.com/mrbenshef/Boop-GTK): A scriptable scratchpad for developers. @@ -47,7 +86,7 @@ cargo build ```shell sudo apt-get install snap snapcraft snapcraft snap -sudo snap install tex-match_1.0.1_amd64.snap +sudo snap install tex-match_1.1.0_amd64.snap ``` #### Linux Flatpak diff --git a/flatpak/data/uk.co.mrbenshef.TeX-Match-symbolic.svg b/flatpak/data/uk.co.mrbenshef.TeX-Match-symbolic.svg new file mode 100644 index 00000000..f090a753 --- /dev/null +++ b/flatpak/data/uk.co.mrbenshef.TeX-Match-symbolic.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/flatpak/data/uk.co.mrbenshef.TeX-Match.metainfo.xml b/flatpak/data/uk.co.mrbenshef.TeX-Match.metainfo.xml index a898f7ac..6966b0ee 100644 --- a/flatpak/data/uk.co.mrbenshef.TeX-Match.metainfo.xml +++ b/flatpak/data/uk.co.mrbenshef.TeX-Match.metainfo.xml @@ -4,19 +4,30 @@ CC0 MIT TeX Match - Search through over 1000 different LaTeX symbols by sketching. + Find LaTeX symbols by sketching

If you work with LaTeX, you know its difficult to memorize the names of all the symbols. TeX Match allows you to search through over 1000 different LaTeX symbols by sketching.

- https://raw.githubusercontent.com/mrbenshef/TeX-Match/trunk/TeX-Match.gif + https://raw.githubusercontent.com/mrbenshef/TeX-Match/trunk/screenshots/light.png Main Window + + https://raw.githubusercontent.com/mrbenshef/TeX-Match/trunk/screenshots/dark.png + Main Window (Adwaita-Dark) + https://tex-match.mrbenshef.co.uk/ + + +
    +
  • New icon (by Tobias Bernard)
  • +
+
+

Remove test notification

diff --git a/flatpak/data/uk.co.mrbenshef.TeX-Match.png b/flatpak/data/uk.co.mrbenshef.TeX-Match.png deleted file mode 100644 index 5bef8a12..00000000 Binary files a/flatpak/data/uk.co.mrbenshef.TeX-Match.png and /dev/null differ diff --git a/flatpak/data/uk.co.mrbenshef.TeX-Match.svg b/flatpak/data/uk.co.mrbenshef.TeX-Match.svg new file mode 100644 index 00000000..e55c16b3 --- /dev/null +++ b/flatpak/data/uk.co.mrbenshef.TeX-Match.svg @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/flatpak/uk.co.mrbenshef.TeX-Match.json b/flatpak/uk.co.mrbenshef.TeX-Match.json index 2f353dc5..03bfb9cb 100644 --- a/flatpak/uk.co.mrbenshef.TeX-Match.json +++ b/flatpak/uk.co.mrbenshef.TeX-Match.json @@ -29,7 +29,8 @@ "install -Dm755 ./target/release/tex-match -t /app/bin/", "install -Dm644 ./flatpak/data/${FLATPAK_ID}.metainfo.xml -t /app/share/metainfo/", "install -Dm644 ./flatpak/data/${FLATPAK_ID}.desktop -t /app/share/applications/", - "install -Dm644 ./flatpak/data/${FLATPAK_ID}.png -t /app/share/icons/hicolor/256x256/apps/" + "install -Dm644 ./flatpak/data/${FLATPAK_ID}.svg -t /app/share/icons/hicolor/scalable/apps/", + "install -Dm644 ./flatpak/data/${FLATPAK_ID}-symbolic.svg -t /app/share/icons/hicolor/symbolic/apps/" ], "sources": [ { diff --git a/flatpak/uk.co.mrbenshef.TeX-Match/uk.co.mrbenshef.TeX-Match.json b/flatpak/uk.co.mrbenshef.TeX-Match/uk.co.mrbenshef.TeX-Match.json index 98b4feed..0c5fd9da 100644 --- a/flatpak/uk.co.mrbenshef.TeX-Match/uk.co.mrbenshef.TeX-Match.json +++ b/flatpak/uk.co.mrbenshef.TeX-Match/uk.co.mrbenshef.TeX-Match.json @@ -29,7 +29,8 @@ "install -Dm755 ./target/release/tex-match -t /app/bin/", "install -Dm644 ./flatpak/data/${FLATPAK_ID}.metainfo.xml -t /app/share/metainfo/", "install -Dm644 ./flatpak/data/${FLATPAK_ID}.desktop -t /app/share/applications/", - "install -Dm644 ./flatpak/data/${FLATPAK_ID}.png -t /app/share/icons/hicolor/256x256/apps/" + "install -Dm644 ./flatpak/data/${FLATPAK_ID}.svg -t /app/share/icons/hicolor/scalable/apps/", + "install -Dm644 ./flatpak/data/${FLATPAK_ID}-symbolic.svg -t /app/share/icons/hicolor/symbolic/apps/" ], "sources": [ { diff --git a/icon.svg b/icon.svg deleted file mode 100644 index 8255f392..00000000 --- a/icon.svg +++ /dev/null @@ -1,137 +0,0 @@ - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/resources/TeX-Match.png b/resources/TeX-Match.png new file mode 100644 index 00000000..2eea8409 Binary files /dev/null and b/resources/TeX-Match.png differ diff --git a/resources/app.glade b/resources/app.glade index 597c6ffd..cace1b98 100644 --- a/resources/app.glade +++ b/resources/app.glade @@ -73,6 +73,7 @@ See the <a href="https://opensource.org/licenses/mit-license.php">The MIT main + 1 @@ -93,40 +94,13 @@ See the <a href="https://opensource.org/licenses/mit-license.php">The MIT True True - - 360 + + 120 True False - False - False - vertical - - - True - False - GDK_POINTER_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK - True - True - - - False - True - 1 - - - - - Clear - True - True - True - - - False - True - 2 - - + GDK_POINTER_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK + True + True False @@ -247,6 +221,18 @@ See the <a href="https://opensource.org/licenses/mit-license.php">The MIT end + + + gtk-clear + True + True + True + True + + + 1 + + diff --git a/resources/tex-match.png b/resources/tex-match.png deleted file mode 100644 index 5bef8a12..00000000 Binary files a/resources/tex-match.png and /dev/null differ diff --git a/screenshots/dark.png b/screenshots/dark.png new file mode 100755 index 00000000..f7a7b0aa Binary files /dev/null and b/screenshots/dark.png differ diff --git a/screenshots/light.png b/screenshots/light.png new file mode 100755 index 00000000..4c26c619 Binary files /dev/null and b/screenshots/light.png differ diff --git a/snap/gui/uk.co.mrbenshef.TeX-Match.svg b/snap/gui/uk.co.mrbenshef.TeX-Match.svg new file mode 100644 index 00000000..e55c16b3 --- /dev/null +++ b/snap/gui/uk.co.mrbenshef.TeX-Match.svg @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index a20686d4..ca84ed27 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -1,8 +1,8 @@ name: tex-match title: TeX Match -version: '1.0.1' -icon: snap/gui/tex-match.png -summary: Search through over 1000 different LaTeX symbols by sketching. +version: '1.1.0' +icon: snap/gui/uk.co.mrbenshef.TeX-Match.svg +summary: Find LaTeX symbols by sketching description: | If you work with LaTeX, you know its difficult to memorize the names of all the symbols. TeX Match allows you to search through over 1000 different LaTeX symbols by sketching. diff --git a/src/main.rs b/src/main.rs index b080a943..bd585220 100644 --- a/src/main.rs +++ b/src/main.rs @@ -112,7 +112,7 @@ fn main() { // add logo to about dialog app.about_dialog.set_logo( - gdk_pixbuf::Pixbuf::from_resource("/uk/co/mrbenshef/TeX-Match/tex-match.png") + gdk_pixbuf::Pixbuf::from_resource("/uk/co/mrbenshef/TeX-Match/TeX-Match.png") .ok() .as_ref(), ); diff --git a/submodules/Windows-10-Dark b/submodules/Windows-10-Dark index b8e55e47..6f3e063e 160000 --- a/submodules/Windows-10-Dark +++ b/submodules/Windows-10-Dark @@ -1 +1 @@ -Subproject commit b8e55e476f1f61a2cc2bdbd6f24632ce594661aa +Subproject commit 6f3e063e271029ddd9159bc1020d81de055155ea diff --git a/submodules/flatpak-builder-tools b/submodules/flatpak-builder-tools index a1a01be1..8b8112be 160000 --- a/submodules/flatpak-builder-tools +++ b/submodules/flatpak-builder-tools @@ -1 +1 @@ -Subproject commit a1a01be1a0a9937651a771313dee59285cee9bb4 +Subproject commit 8b8112be801f39b898cd6dea10dbb90dfd564160 diff --git a/submodules/gvsbuild b/submodules/gvsbuild index 19b65a23..aa012bd0 160000 --- a/submodules/gvsbuild +++ b/submodules/gvsbuild @@ -1 +1 @@ -Subproject commit 19b65a2369e24f41a0b36a57f4f1ee9a0aec1158 +Subproject commit aa012bd065672dddc5494d76ba63f9929f3b3522 diff --git a/uk.co.mrbenshef.TeX-Match-symbolic.svg b/uk.co.mrbenshef.TeX-Match-symbolic.svg new file mode 100644 index 00000000..f090a753 --- /dev/null +++ b/uk.co.mrbenshef.TeX-Match-symbolic.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/uk.co.mrbenshef.TeX-Match.Source.svg b/uk.co.mrbenshef.TeX-Match.Source.svg new file mode 100644 index 00000000..d66b61c3 --- /dev/null +++ b/uk.co.mrbenshef.TeX-Match.Source.svg @@ -0,0 +1,719 @@ + + + Adwaita Icon Template + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + GNOME Design Team + + + + + Adwaita Icon Template + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/uk.co.mrbenshef.TeX-Match.svg b/uk.co.mrbenshef.TeX-Match.svg new file mode 100644 index 00000000..e55c16b3 --- /dev/null +++ b/uk.co.mrbenshef.TeX-Match.svg @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/wix/main.wxs b/wix/main.wxs index b354764a..91fd6b80 100644 --- a/wix/main.wxs +++ b/wix/main.wxs @@ -103,9 +103,6 @@ - - - @@ -133,9 +130,6 @@ - - - @@ -210,27 +204,27 @@ - + - + - + - + - + - + - + @@ -335,7 +329,6 @@ - @@ -345,7 +338,6 @@ -