Skip to content

Commit

Permalink
[75_3] bump to lolly 1.3.14 and then 1.3.15
Browse files Browse the repository at this point in the history
  • Loading branch information
@da-liii
da-liii authored Jan 9, 2024
1 parent 02bec5e commit 7516af4
Show file tree
Hide file tree
Showing 7 changed files with 46 additions and 62 deletions.
6 changes: 3 additions & 3 deletions src/Graphics/Fonts/virtual_font.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ virtual_font_rep::supported (scheme_tree t, bool svg) {
if (is_tuple (t, "with", 3) && is_atomic (t[1])) {
tree var= t[1];
tree val= exec (t[2]);
return supported (replace (t[3], var, val), svg);
return supported (tree_replace (t[3], var, val), svg);
}

if (is_tuple (t, "or") && N (t) >= 2) {
Expand Down Expand Up @@ -473,7 +473,7 @@ virtual_font_rep::compile_bis (scheme_tree t, metric& ex) {
if (is_tuple (t, "with", 3) && is_atomic (t[1])) {
tree var= t[1];
tree val= exec (t[2]);
return compile (replace (t[3], var, val), ex);
return compile (tree_replace (t[3], var, val), ex);
}

if (is_tuple (t, "or") && N (t) >= 2) {
Expand Down Expand Up @@ -1182,7 +1182,7 @@ virtual_font_rep::draw_tree (renderer ren, scheme_tree t, SI x, SI y) {
if (is_tuple (t, "with", 3) && is_atomic (t[1])) {
tree var= t[1];
tree val= exec (t[2]);
draw_tree (ren, replace (t[3], var, val), x, y);
draw_tree (ren, tree_replace (t[3], var, val), x, y);
return;
}

Expand Down
1 change: 1 addition & 0 deletions src/Graphics/Renderer/brush.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
#include "image_files.hpp"
#include "true_color.hpp"
#include "tm_url.hpp"
#include "file.hpp"
#include "colors.hpp"
#include "tree_analyze.hpp"

Expand Down
2 changes: 1 addition & 1 deletion src/Plugins/Tex/conservative_fromtex.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ rename_arguments (tree val, tree old) {
int a= N(old) - 1;
for (int i=0; i<a; i++)
if (is_atomic (val[i]) && is_atomic (old[i])) {
val[a]= replace (val[a], tree (ARG, val[i]), tree (ARG, old[i]));
val[a]= tree_replace (val[a], tree (ARG, val[i]), tree (ARG, old[i]));
val[i]= old[i];
}
}
Expand Down
16 changes: 0 additions & 16 deletions src/System/Classes/tm_url.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -315,22 +315,6 @@ descendance (url u) {
return factor (descendance_sub (u));
}

url
subdirectories (url u) {
if (is_or (u))
return subdirectories (u[1]) | subdirectories (u[2]);
else if (is_directory (u)) {
url ret= u;
bool error_flag;
array<string> dir= read_directory (u, error_flag);
for (int i=0; i<N(dir); i++)
if (!starts (dir[i], ".") && is_directory (u * dir[i]))
ret= ret | subdirectories (u * dir[i]);
return ret;
}
else return url_none ();
}

/******************************************************************************
* Concretization of resolved urls
******************************************************************************/
Expand Down
1 change: 0 additions & 1 deletion src/System/Classes/tm_url.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ bool exists (url u); // file exists
bool exists_in_path (url u); // file exists in path
bool has_permission (url u, string filter); // check file permissions
url descendance (url u); // utility for style&package menus
url subdirectories (url u); // similarly for patters
url concretize_url (url u); // variant of concretize below
string concretize (url u); // system name for resolved url
string materialize (url u, string f= "fr"); // resolve + concretize
Expand Down
78 changes: 39 additions & 39 deletions xmake-requires.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,122 +10,122 @@
repo = {
branch = "master",
commit = "22223c3e860144e789c3c986e064369d66f37573",
url = "https://github.com/tboox/xmake-repo.git"
url = "https://github.com/xmake-io/xmake-repo.git"
},
version = "3.26.4"
},
["cpr#31fecfc4"] = {
repo = {
branch = "master",
commit = "22223c3e860144e789c3c986e064369d66f37573",
url = "https://github.com/tboox/xmake-repo.git"
url = "https://github.com/xmake-io/xmake-repo.git"
},
version = "1.10.5"
},
["freetype#31fecfc4"] = {
repo = {
branch = "master",
commit = "22223c3e860144e789c3c986e064369d66f37573",
url = "https://github.com/tboox/xmake-repo.git"
url = "https://github.com/xmake-io/xmake-repo.git"
},
version = "2.12.1"
},
["libaesgm#31fecfc4"] = {
repo = {
branch = "master",
commit = "b0f8a0654cdf3672eb65e050768bfbfb64b24210",
url = "https://github.com/tboox/xmake-repo.git"
url = "https://github.com/xmake-io/xmake-repo.git"
},
version = "2013.1.1"
},
["libcurl#31fecfc4"] = {
repo = {
branch = "master",
commit = "22223c3e860144e789c3c986e064369d66f37573",
url = "https://github.com/tboox/xmake-repo.git"
url = "https://github.com/xmake-io/xmake-repo.git"
},
version = "8.4.0"
},
["libgit2 1.7.1#31fecfc4"] = {
repo = {
branch = "master",
commit = "e4a467ab6e25d9afa5324cf536141660a5c1eef4",
url = "https://github.com/tboox/xmake-repo.git"
url = "https://github.com/xmake-io/xmake-repo.git"
},
version = "v1.7.1"
},
["libjpeg#31fecfc4"] = {
repo = {
branch = "master",
commit = "b0f8a0654cdf3672eb65e050768bfbfb64b24210",
url = "https://github.com/tboox/xmake-repo.git"
commit = "e4a467ab6e25d9afa5324cf536141660a5c1eef4",
url = "https://github.com/xmake-io/xmake-repo.git"
},
version = "1.5.2"
},
["libpng#31fecfc4"] = {
repo = {
branch = "master",
commit = "e4a467ab6e25d9afa5324cf536141660a5c1eef4",
url = "https://github.com/tboox/xmake-repo.git"
commit = "22223c3e860144e789c3c986e064369d66f37573",
url = "https://github.com/xmake-io/xmake-repo.git"
},
version = "1.6.36"
},
["lolly#31fecfc4"] = {
version = "v1.3.13"
version = "v1.3.15"
},
["openssl#31fecfc4"] = {
repo = {
branch = "master",
commit = "e4a467ab6e25d9afa5324cf536141660a5c1eef4",
url = "https://github.com/tboox/xmake-repo.git"
commit = "22223c3e860144e789c3c986e064369d66f37573",
url = "https://github.com/xmake-io/xmake-repo.git"
},
version = "1.1.1d"
},
["pcre#31fecfc4"] = {
repo = {
branch = "master",
commit = "e4a467ab6e25d9afa5324cf536141660a5c1eef4",
url = "https://github.com/tboox/xmake-repo.git"
url = "https://github.com/xmake-io/xmake-repo.git"
},
version = "8.45"
},
["pdfhummus 4.6.2#23149c54"] = {
repo = {
branch = "master",
commit = "e4a467ab6e25d9afa5324cf536141660a5c1eef4",
url = "https://github.com/tboox/xmake-repo.git"
url = "https://github.com/xmake-io/xmake-repo.git"
},
version = "v4.6.2"
},
["pkg-config#31fecfc4"] = {
repo = {
branch = "master",
commit = "e4a467ab6e25d9afa5324cf536141660a5c1eef4",
url = "https://github.com/tboox/xmake-repo.git"
commit = "22223c3e860144e789c3c986e064369d66f37573",
url = "https://github.com/xmake-io/xmake-repo.git"
},
version = "0.29"
},
["s7 2023.04.13#31fecfc4"] = {
repo = {
branch = "master",
commit = "b0f8a0654cdf3672eb65e050768bfbfb64b24210",
url = "https://github.com/tboox/xmake-repo.git"
url = "https://github.com/xmake-io/xmake-repo.git"
},
version = "2023.04.13"
},
["tbox#31fecfc4"] = {
repo = {
branch = "master",
commit = "22223c3e860144e789c3c986e064369d66f37573",
url = "https://github.com/tboox/xmake-repo.git"
url = "https://github.com/xmake-io/xmake-repo.git"
},
version = "v1.7.5"
},
["zlib#31fecfc4"] = {
repo = {
branch = "master",
commit = "e4a467ab6e25d9afa5324cf536141660a5c1eef4",
url = "https://github.com/tboox/xmake-repo.git"
commit = "22223c3e860144e789c3c986e064369d66f37573",
url = "https://github.com/xmake-io/xmake-repo.git"
},
version = "1.2.11"
}
Expand All @@ -134,107 +134,107 @@
["cmake#31fecfc4"] = {
repo = {
branch = "master",
commit = "e4a467ab6e25d9afa5324cf536141660a5c1eef4",
url = "https://github.com/tboox/xmake-repo.git"
commit = "e6867621fe3fc79693657c95209dc400ea2181ce",
url = "https://github.com/xmake-io/xmake-repo.git"
},
version = "3.26.4"
},
["cpr#31fecfc4"] = {
repo = {
branch = "master",
commit = "e6867621fe3fc79693657c95209dc400ea2181ce",
url = "https://github.com/tboox/xmake-repo.git"
url = "https://github.com/xmake-io/xmake-repo.git"
},
version = "1.10.5"
},
["freetype#31fecfc4"] = {
repo = {
branch = "master",
commit = "e6867621fe3fc79693657c95209dc400ea2181ce",
url = "https://github.com/tboox/xmake-repo.git"
url = "https://github.com/xmake-io/xmake-repo.git"
},
version = "2.12.1"
},
["libaesgm#31fecfc4"] = {
repo = {
branch = "master",
commit = "e6867621fe3fc79693657c95209dc400ea2181ce",
url = "https://github.com/tboox/xmake-repo.git"
url = "https://github.com/xmake-io/xmake-repo.git"
},
version = "2013.1.1"
},
["libcurl#31fecfc4"] = {
repo = {
branch = "master",
commit = "e6867621fe3fc79693657c95209dc400ea2181ce",
url = "https://github.com/tboox/xmake-repo.git"
url = "https://github.com/xmake-io/xmake-repo.git"
},
version = "8.4.0"
},
["libgit2 1.7.1#31fecfc4"] = {
repo = {
branch = "master",
commit = "9886374ff681155238d87a525cb01af86f23562d",
url = "https://github.com/tboox/xmake-repo.git"
url = "https://github.com/xmake-io/xmake-repo.git"
},
version = "v1.7.1"
},
["libiconv 1.17#31fecfc4"] = {
repo = {
branch = "master",
commit = "e6867621fe3fc79693657c95209dc400ea2181ce",
url = "https://github.com/tboox/xmake-repo.git"
url = "https://github.com/xmake-io/xmake-repo.git"
},
version = "1.17"
},
["libjpeg#31fecfc4"] = {
repo = {
branch = "master",
commit = "e6867621fe3fc79693657c95209dc400ea2181ce",
url = "https://github.com/tboox/xmake-repo.git"
url = "https://github.com/xmake-io/xmake-repo.git"
},
version = "v9e"
},
["libpng#31fecfc4"] = {
repo = {
branch = "master",
commit = "e6867621fe3fc79693657c95209dc400ea2181ce",
url = "https://github.com/tboox/xmake-repo.git"
url = "https://github.com/xmake-io/xmake-repo.git"
},
version = "v1.6.37"
},
["lolly#31fecfc4"] = {
version = "v1.3.13"
version = "v1.3.15"
},
["pdfhummus 4.6.2#23149c54"] = {
repo = {
branch = "master",
commit = "fa0dfd012f7ddd06660c41e4575792c20b67999d",
url = "https://github.com/tboox/xmake-repo.git"
url = "https://github.com/xmake-io/xmake-repo.git"
},
version = "v4.6.2"
},
["s7 2023.04.13#31fecfc4"] = {
repo = {
branch = "master",
commit = "e6867621fe3fc79693657c95209dc400ea2181ce",
url = "https://github.com/tboox/xmake-repo.git"
url = "https://github.com/xmake-io/xmake-repo.git"
},
version = "2023.04.13"
},
["tbox#31fecfc4"] = {
repo = {
branch = "master",
commit = "e6867621fe3fc79693657c95209dc400ea2181ce",
url = "https://github.com/tboox/xmake-repo.git"
url = "https://github.com/xmake-io/xmake-repo.git"
},
version = "v1.7.5"
},
["zlib#31fecfc4"] = {
repo = {
branch = "master",
commit = "e4a467ab6e25d9afa5324cf536141660a5c1eef4",
url = "https://github.com/tboox/xmake-repo.git"
commit = "e6867621fe3fc79693657c95209dc400ea2181ce",
url = "https://github.com/xmake-io/xmake-repo.git"
},
version = "1.2.11"
}
Expand Down Expand Up @@ -324,7 +324,7 @@
version = "v1.6.37"
},
["lolly#31fecfc4"] = {
version = "v1.3.13"
version = "v1.3.15"
},
["nasm#31fecfc4"] = {
repo = {
Expand Down Expand Up @@ -354,7 +354,7 @@
repo = {
branch = "master",
commit = "e4a467ab6e25d9afa5324cf536141660a5c1eef4",
url = "https://github.com/tboox/xmake-repo.git"
url = "https://github.com/xmake-io/xmake-repo.git"
},
version = "2.0.3"
},
Expand Down
4 changes: 2 additions & 2 deletions xmake/packages.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
local S7_VERSION = "2023.04.13"
local QT6_VERSION = "6.5.3"
local QTIFW_VERSION = "4.6.0"
local LOLLY_VERSION = "1.3.13"
local LOLLY_VERSION = "1.3.15"
local TBOX_VERSION = "1.7.5"
local CPR_VERSION = "1.10.5"
local CURL_VERSION = "8.4.0"
Expand All @@ -43,7 +43,7 @@ package("lolly")
add_deps("cpr")
end

add_versions("v" .. LOLLY_VERSION, "b34f44bb3a505e2e9d2897bd3cb831aaa722238d")
add_versions("v" .. LOLLY_VERSION, "a6bcf19a3944d67f2f498975cf3206a1d9482148")

on_install("linux", "macosx", "mingw", "wasm", "windows", function (package)
local configs = {}
Expand Down

0 comments on commit 7516af4

Please sign in to comment.