From 4c25f6fee6674a41c1919700fdb78806866b0643 Mon Sep 17 00:00:00 2001 From: "Hanna K." Date: Fri, 28 Jun 2024 15:47:33 +0200 Subject: [PATCH] Return n >= a + 1 for n > a, and n <= a - 1 for n < a, if a is an integer (and n represents an integer); Improve MathStructure::representsFinite(); Increment version number; Update exchange rates --- ChangeLog | 6 +- configure.ac | 6 +- data/eurofxref-daily.xml | 60 +- data/functions.xml.in | 2 +- data/rates.json | 1496 ++++++++++++----------- docs/reference/Doxyfile | 2 +- libqalculate/Calculator-definitions.cc | 2 +- libqalculate/Calculator.cc | 20 +- libqalculate/MathStructure-calculate.cc | 62 +- libqalculate/MathStructure-isolatex.cc | 2 +- libqalculate/MathStructure.cc | 13 +- libqalculate/includes.h | 4 +- m4/libtool.m4 | 234 ++-- m4/ltoptions.m4 | 6 +- m4/ltsugar.m4 | 2 +- m4/ltversion.m4 | 12 +- m4/lt~obsolete.m4 | 2 +- src/qalc.cc | 2 +- 18 files changed, 954 insertions(+), 979 deletions(-) diff --git a/ChangeLog b/ChangeLog index e2a68734..e235a4d7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2024-06-27 Hanna Knutsson + + * Return n >= a + 1 for n > a, and n <= a - 1 for n < a, if a is an integer (and n represents an integer) + 2024-06-22 Hanna Knutsson * Always return false for 1/f(x)=0 (not f(x)=infinity) @@ -26,7 +30,7 @@ * Preserve allow_infinite parameter for recursive comparison in MathStructure::equals() * Return true for infinity multiplied by zero in MathStructure::representsUndefined() * Add recursion counter to MathStructure::isolate_x() and MathStructure::isolate_x_sub() (variable isolation) to avoid stack overflow - * Return true both text strings are empty in equalsIgnoreCase() + * Return true if both text strings are empty in equalsIgnoreCase() * Fix parenthesis added in front of multiplication sign in some cases * Use less strict rules when comparing with previous expression (to avoid infinite loop) when isolating variable, in MathStructure::isolate_x_sub(); * Do not apply x+x^(1/a)=b => x=(b-x)^a if (part of) x represents undefined diff --git a/configure.ac b/configure.ac index 3fa67b3a..b309484a 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,7 @@ dnl ---------------------- dnl | initialize autotools |--------------------------------------------------- dnl ---------------------- -AC_INIT([libqalculate],[5.1.1]) +AC_INIT([libqalculate],[5.2.0]) AC_CONFIG_SRCDIR(libqalculate/Calculator.cc) AM_INIT_AUTOMAKE AC_CONFIG_HEADERS(config.h) @@ -69,7 +69,7 @@ AC_DEFINE([HAVE_PTHREADS],1, dnl libtool versioning for libqalculate dnl increment if the interface has additions, changes, removals. -QALCULATE_CURRENT=24 +QALCULATE_CURRENT=25 dnl increment any time the source changes; set to dnl 0 if you increment CURRENT @@ -78,7 +78,7 @@ QALCULATE_REVISION=0 dnl increment if any interfaces have been added; set to 0 dnl if any interfaces have been removed. removal has dnl precedence over adding, so set to 0 if both happened. -QALCULATE_AGE=1 +QALCULATE_AGE=2 AC_SUBST(QALCULATE_CURRENT) AC_SUBST(QALCULATE_REVISION) diff --git a/data/eurofxref-daily.xml b/data/eurofxref-daily.xml index e22715f9..a86b0fe9 100644 --- a/data/eurofxref-daily.xml +++ b/data/eurofxref-daily.xml @@ -5,37 +5,37 @@ European Central Bank - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/data/functions.xml.in b/data/functions.xml.in index df93f5db..ec9402cc 100644 --- a/data/functions.xml.in +++ b/data/functions.xml.in @@ -1,5 +1,5 @@ - + <_title>Matrices & Vectors diff --git a/data/rates.json b/data/rates.json index 2fa6765a..03205952 100644 --- a/data/rates.json +++ b/data/rates.json @@ -1,761 +1,789 @@ { - "date": "2024-04-30", + "date": "2024-06-25", "eur": { - "$myro": 7.12660203, - "$wen": 5641.57471211, - "00": 13.13213235, - "0x0": 3.75538877, - "1000sats": 3675.21031324, - "10set": 0.92286307, - "1inch": 2.51538574, - "aave": 0.011898636, - "abt": 0.48322789, - "ach": 32.57484193, - "acs": 460.81620366, - "ada": 2.32521105, - "aed": 3.93526801, - "aergo": 8.07522231, - "aero": 0.97112407, - "aevo": 0.69626227, - "afn": 77.62809083, - "agi": 4.08695098, - "agix": 1.19869534, - "agld": 0.96011289, - "ai": 1.11516432, - "aioz": 1.65265577, - "akt": 0.25147801, - "alcx": 0.042573778, - "aleph": 3.24918739, - "alex": 3.59459113, - "algo": 5.59307936, - "alice": 0.83262005, - "all": 100.60604404, - "alph": 0.49502203, - "alt": 2.78020604, - "alusd": 1.09945228, - "amd": 413.56991002, - "amp": 133.3135359, - "ampl": 1.04904058, - "ang": 1.91892714, - "ankr": 20.04268213, - "ant": 0.13084509, - "aoa": 903.47860215, - "ape": 0.86078495, - "apex": 0.41570965, - "api3": 0.4578432, - "apl": 29261.78334739, - "apt": 0.11638879, - "ar": 0.029831244, - "arb": 1.00597612, - "ark": 1.37133731, - "arkm": 0.52400098, - "arpa": 15.68934114, - "ars": 939.40946061, - "asm": 32.52145675, - "ast": 7.9938978, - "astr": 10.30862689, - "ata": 4.49180453, - "atom": 0.13066888, + "$myro": 7.61838342, + "$wen": 10860.60171339, + "00": 20.12474227, + "0x0": 5.16173745, + "1000sats": 6465.28079452, + "10set": 2.19988922, + "1inch": 2.71578005, + "aave": 0.012278127, + "abt": 0.41820395, + "ach": 47.23930834, + "acs": 594.50981478, + "ada": 2.87899204, + "aed": 3.94260142, + "aergo": 12.39786374, + "aero": 1.48529788, + "aevo": 2.0783046, + "afn": 75.99091324, + "agi": 4.45421474, + "agix": 1.59975316, + "agld": 1.03529724, + "ai": 1.52085284, + "aioz": 2.44679809, + "akt": 0.36419944, + "alcx": 0.058035405, + "aleph": 4.60104993, + "alex": 14.19578673, + "algo": 7.94872385, + "alice": 0.94929708, + "all": 100.2595562, + "alph": 0.788405, + "alt": 5.54803262, + "alusd": 1.10724942, + "amd": 414.41362102, + "amp": 222.30064162, + "ampl": 1.18384124, + "andy": 6269.02306703, + "ang": 1.92234831, + "ankr": 35.33503373, + "ant": 0.12796994, + "aoa": 927.29323104, + "ape": 1.11800188, + "apex": 0.3977819, + "api3": 0.49844708, + "apl": 3689.31986552, + "apt": 0.15476163, + "apu": 2704.81685207, + "ar": 0.038003742, + "arb": 1.3180795, + "ark": 2.27873233, + "arkm": 0.55343041, + "arpa": 22.91686233, + "ars": 975.64552168, + "asm": 44.5130597, + "ast": 10.38351064, + "astr": 15.94478745, + "ata": 9.86249819, + "ath": 15.29780888, + "atom": 0.15546238, "ats": 13.7603, - "auction": 0.063164279, - "aud": 1.63366611, - "audio": 6.06613077, - "aurora": 4.39172951, - "avax": 0.030149355, - "avt": 0.31060348, - "awg": 1.91807481, - "axl": 0.96839908, - "axs": 0.14855925, - "azero": 1.44535017, - "azm": 9114.43551037, - "azn": 1.8228871, - "babydoge": 545481790.5702467, - "badger": 0.24891568, - "bake": 4.2477384, - "bal": 0.29040163, + "auction": 0.06570716, + "aud": 1.61327353, + "audio": 7.01964694, + "aurora": 7.58766784, + "avax": 0.043267249, + "avt": 0.50406338, + "awg": 1.92164916, + "axl": 1.86690141, + "axs": 0.17981811, + "azero": 1.83860906, + "azm": 9128.28176001, + "azn": 1.82565635, + "babydoge": 763058207.6341187, + "badger": 0.33976424, + "bake": 3.88847269, + "bal": 0.35848247, "bam": 1.95583, - "band": 0.72649627, - "bat": 4.27385377, - "bbd": 2.14310035, - "bch": 0.0022887622, - "bdt": 117.60633486, - "bdx": 29.83481687, - "beam": 41.23681409, + "band": 0.95351243, + "bat": 5.64197644, + "bb": 2.84659342, + "bbd": 2.14709403, + "bch": 0.0028701316, + "bdt": 126.11959463, + "bdx": 31.17296975, + "beam": 66.09745891, + "beer": 18426.00026856, "bef": 40.3399, - "bgb": 0.9217231, + "bgb": 0.99101124, "bgn": 1.95583, - "bhd": 0.40290287, - "bico": 2.31718456, - "bif": 3069.18017792, - "bigtime": 5.98582281, - "bit": 1.01677768, - "bld": 8.47709684, - "blur": 2.67060935, - "blz": 3.14523628, - "bmd": 1.07155017, - "bnb": 0.0017852848, - "bnd": 1.45790038, - "bnt": 1.53708958, - "bob": 7.43627762, - "boba": 2.80482136, - "boden": 2.39010455, - "bome": 109.41619429, - "bond": 0.36639741, - "bone": 1.76918496, - "bonk": 42080.58118987, - "bora": 6.55805197, - "borg": 5.46603909, - "brett": 26.29261775, - "brl": 5.4846674, - "bsd": 1.07155017, - "bsv": 0.016259486, - "bsw": 12.68098855, - "btc": 0.000016674285, - "btc.b": 0.000016756484, - "btcb": 0.000016634589, - "btg": 0.032207006, - "btn": 89.41560883, - "btrst": 1.22606636, - "btt": 829731.01803726, - "busd": 1.07107179, - "bwp": 14.77974162, - "byn": 3.50399113, - "byr": 35039.9112969, - "bzd": 2.16928147, - "c98": 3.79926254, - "cad": 1.4643826, - "caf": 888.30172778, - "cake": 0.39273933, - "canto": 7.11224808, - "cbeth": 0.00031232079, - "cdai": 46.1692211, - "cdf": 2983.69409915, - "cdt": 2.70825157, - "celo": 1.30149014, - "celr": 41.76079501, - "ceth": 0.016584579, - "cfg": 1.62852638, - "cfx": 4.68708681, - "cgld": 1.31160588, - "cheel": 0.068701993, - "chex": 4.28048294, - "chf": 0.97640004, - "chr": 3.5607817, - "chz": 9.38529783, - "ckb": 57.43241095, - "clp": 1009.44590681, - "clv": 14.00760784, - "cnh": 7.76352276, - "cny": 7.74925095, - "comai": 1.35741078, - "comp": 0.018964852, - "cop": 4135.16214227, - "coq": 346654.34319934, - "core": 0.50568538, - "corgiai": 701.87157085, - "coti": 9.20207815, - "coval": 48.86374829, - "cqt": 5.91461114, - "crc": 541.86793288, - "cro": 8.04680982, - "crpt": 22.99501818, - "crv": 2.45669973, - "cspr": 35.00034426, - "ctc": 1.56781263, - "ctsi": 5.40520555, - "ctx": 0.2292154, - "cuc": 1.07155017, - "cup": 25.7514439, - "cvc": 6.53602928, + "bhd": 0.40365368, + "bico": 2.84902481, + "bif": 3087.35219438, + "bigtime": 8.86000165, + "bit": 1.42744798, + "bld": 10.59318858, + "blur": 4.26985484, + "blz": 4.58532992, + "bmd": 1.07354702, + "bnb": 0.001885724, + "bnd": 1.45200377, + "bnt": 1.74026258, + "bob": 7.40735682, + "boba": 4.38047736, + "boden": 7.41911061, + "bome": 120.85350343, + "bond": 0.51762704, + "bone": 2.21378278, + "bonk": 49363.44827586, + "bora": 10.7243796, + "borg": 6.31595013, + "bpx": 17303.92820334, + "brett": 7.38252422, + "brl": 5.78708673, + "bsd": 1.07354702, + "bsv": 0.024392255, + "bsw": 17.03148433, + "btc": 0.000017792431, + "btc.b": 0.000017791641, + "btcb": 2.24013069, + "btg": 0.041230424, + "btn": 89.62461552, + "btrst": 1.82129771, + "btt": 1256362.76247137, + "busd": 1.07396979, + "bwp": 14.49137175, + "byn": 3.510601, + "byr": 35106.00998748, + "bzd": 2.16258086, + "c98": 6.05558376, + "cad": 1.46598428, + "caf": 2854.20813352, + "cake": 0.50100097, + "canto": 11.78867544, + "cbeth": 0.00029861907, + "cdai": 45.62733987, + "cdf": 3049.00017345, + "cdt": 3.11772403, + "cel": 1.16544749, + "celo": 1.84082152, + "celr": 65.07, + "ceth": 0.015909164, + "cfg": 2.32136869, + "cfx": 6.84445476, + "cgld": 1.83845034, + "cheel": 0.055111782, + "chex": 9.17959131, + "chf": 0.95780674, + "chr": 5.04135325, + "chz": 13.95789319, + "ckb": 97.79265521, + "clp": 1014.93561463, + "clv": 21.11415929, + "cnh": 7.81870809, + "cny": 7.7923882, + "comai": 2.8971305, + "comp": 0.022246518, + "cop": 4389.65405794, + "coq": 771815.29247227, + "core": 0.7829402, + "corechain": 0.78027253, + "corgiai": 965.60367768, + "coti": 11.45232, + "coval": 114.27940394, + "cqt": 7.44562675, + "crc": 561.62698063, + "cro": 12.10618626, + "crpt": 26.16683192, + "crv": 3.34271438, + "cspr": 50.22015793, + "ctc": 2.31263704, + "ctsi": 6.49912228, + "ctx": 0.37409582, + "cuc": 1.07354702, + "cup": 25.73821169, + "cvc": 10.17200379, "cve": 110.27, - "cvx": 0.41246901, - "cwbtc": 0.00083583166, + "cvx": 0.35748186, + "cwbtc": 0.00088577682, "cyp": 0.585274, - "czk": 25.15180071, - "dag": 26.51130551, - "dai": 1.07147521, - "dao": 1.14095017, - "dar": 7.2160404, - "dash": 0.036184656, - "dcr": 0.051025728, - "ddx": 29.89147483, - "degen": 44.36779497, + "czk": 24.87459359, + "dag": 35.34751321, + "dai": 1.07373078, + "dao": 2.02563194, + "dar": 8.91, + "dash": 0.046428483, + "dcr": 0.070588772, + "ddx": 25.89069547, + "degen": 120.5150863, "dem": 1.95583, - "deso": 0.041048918, - "dexe": 0.08549618, - "dext": 1.28310124, - "dfi": 16.00095894, - "dgb": 95.36583192, - "dia": 2.17588938, - "dimo": 3.73152488, - "djf": 190.94717414, - "dkk": 7.45760513, - "dnt": 17.45247557, - "doge": 7.19304183, - "dop": 62.70092046, - "dora": 7.64412064, - "dot": 0.16137243, - "drep": 64.22748307, - "dydx": 0.49833459, - "dym": 0.30961713, - "dyp": 2.16481212, - "dzd": 144.10351871, - "edu": 1.92316178, - "edum": 1.19692684, + "deso": 0.063081962, + "dexe": 0.09652527, + "dext": 1.5942609, + "dfi": 29.00371529, + "dgb": 133.84367969, + "dia": 2.58846149, + "dimo": 7.02814781, + "djf": 190.89734102, + "dkk": 7.45919871, + "dnt": 24.51267123, + "dog": 190.20820147, + "doge": 8.93769058, + "dop": 63.28963111, + "dora": 9.69137312, + "dot": 0.18708951, + "drep": 151.0847577, + "dydx": 0.77390697, + "dym": 0.67488525, + "dyp": 4.09042594, + "dzd": 144.40668196, + "ecoin": 8593.90208525, + "edu": 1.76001079, + "edum": 1.6028474, "eek": 15.64664, - "eeth": 0.00033287385, - "egld": 0.026601401, - "egp": 51.27431121, - "ela": 0.33170779, - "elf": 1.81117237, - "elg": 0.89802124, - "eml": 5.78109191, - "ena": 1.15811065, - "enj": 3.52545417, - "ens": 0.064709058, - "eos": 1.31598629, - "ern": 16.07325261, + "eeth": 0.00032153509, + "egld": 0.036882618, + "egp": 51.8691967, + "ela": 0.47749833, + "elf": 2.99091995, + "elg": 1.02246389, + "eml": 5.58688606, + "ena": 1.91867274, + "enj": 5.34486022, + "ens": 0.044913407, + "eos": 1.88645971, + "ern": 16.10320525, "esp": 166.386, - "etb": 61.51673208, - "etc": 0.038443358, - "eth": 0.00033184741, - "eth2": 0.00033334899, - "ethdydx": 0.50408721, - "ethfi": 0.23864381, - "ethw": 0.27185755, - "ethx": 0.00032469631, + "etb": 61.92655408, + "etc": 0.046750823, + "eth": 0.0003214583, + "eth2": 0.00032044859, + "ethdydx": 0.77382464, + "ethfi": 0.32781047, + "ethw": 0.45554857, + "ethx": 0.00031155679, "eur": 1, - "euroc": 1.0054722, - "ever": 28.21945749, - "ezeth": 0.00033897374, - "farm": 0.013575499, - "fdusd": 1.07248399, - "fei": 1.09010344, - "fet": 0.49459153, - "fida": 3.43841489, - "fil": 0.17969836, + "eurc": 1.0020112, + "euroc": 1.00044252, + "ever": 18.98300274, + "ezeth": 0.00031741369, + "farm": 0.022293501, + "fdusd": 1.07025186, + "fei": 1.10917222, + "fet": 0.65785668, + "fida": 3.61987525, + "fil": 0.2445647, "fim": 5.94573, - "fis": 1.94338411, - "fjd": 2.43182961, - "fkp": 0.85357277, - "floki": 6284.90737749, - "flow": 1.18055208, - "flr": 35.73691482, - "flux": 1.20227659, - "fnsa": 0.040159173, - "fort": 4.14859466, - "forth": 0.258524, - "fox": 12.67394441, - "frax": 1.07311071, + "fis": 2.7, + "fjd": 2.41938512, + "fkp": 0.84616987, + "floki": 6394.64016346, + "flow": 1.72779594, + "flr": 46.43755295, + "flux": 1.69471887, + "fnsa": 0.049400145, + "fort": 5.73840192, + "forth": 0.36769007, + "fox": 21.45164835, + "frax": 1.07640566, "frf": 6.55957, - "frxeth": 0.00033412516, - "ftm": 1.4791575, - "ftn": 0.54769526, - "ftt": 0.75541446, - "fx": 6.97871703, - "fxs": 0.24120913, - "gaj": 190.82191708, - "gal": 0.30279231, - "gala": 23.50460265, - "gas": 0.19555942, - "gbp": 0.85357277, - "gel": 2.87686764, - "gf": 2.60800659, - "gfi": 0.36089923, - "ggp": 0.85357277, - "ghc": 145717.22240756, - "ghs": 14.57172224, - "ghst": 0.57242628, - "gip": 0.85357277, - "glm": 2.0448087, - "glmr": 3.57437628, - "gmd": 72.77267246, - "gmt": 4.60697334, - "gmx": 0.040215738, - "gnf": 9234.20261864, - "gno": 0.0032047267, - "gns": 0.3196837, - "gnt": 2.04512711, - "gods": 4.76936977, - "grd": 340.75, - "grin": 21.36755223, - "grt": 4.16504845, - "gst": 32.30819326, - "gt": 0.13533448, - "gtc": 0.90428861, - "gtq": 8.34141835, - "gusd": 1.07160472, - "gxc": 0.51132822, - "gyd": 224.10848486, - "gyen": 167.09527522, - "hbar": 10.35028686, - "hbtc": 0.000088998848, - "hft": 3.77251188, - "high": 0.2957312, - "hkd": 8.38627017, - "hnl": 26.49539727, - "hnt": 0.18238555, - "honey": 10.72118059, - "hopr": 9.8445751, - "hot": 438.78881174, + "friend": 1.91429822, + "frxeth": 0.00032163022, + "ftm": 1.74569529, + "ftn": 0.48491657, + "ftt": 0.75777709, + "fx": 9.54784349, + "fxs": 0.32434546, + "gaj": 214.90362732, + "gal": 0.47193626, + "gala": 38.12954368, + "gas": 0.30141396, + "gbp": 0.84616987, + "gel": 3.05777907, + "gf": 5.17412235, + "gfi": 0.45421682, + "ggp": 0.84616987, + "ghc": 162928.0688796, + "ghs": 16.29280689, + "ghst": 0.84340534, + "gip": 0.84616987, + "glm": 3.01715611, + "glmr": 5.27435313, + "gmd": 72.81669954, + "gmt": 6.54667683, + "gmx": 0.037870757, + "gnf": 9237.08268376, + "gno": 0.0036483732, + "gns": 0.37930363, + "gnt": 3.0097909, + "gods": 6.4350445, + "grd": 340.74999999, + "grin": 35.99380483, + "grt": 4.92124867, + "gst": 63.39671105, + "gt": 0.14323732, + "gtc": 1.10118462, + "gtq": 8.32245808, + "gusd": 1.07218357, + "gxc": 2.81946927, + "gyd": 223.89994712, + "gyen": 171.64748201, + "hbar": 13.81341213, + "hbtc": 0.000052945382, + "hft": 5.16056236, + "high": 0.5338911, + "hkd": 8.38122271, + "hnl": 26.52263648, + "hnt": 0.33552125, + "honey": 18.90237676, + "hopr": 16.04865471, + "hot": 595.56702496, "hrk": 7.5345, - "ht": 1.79094915, - "htg": 142.22856129, - "huf": 391.31169758, - "icp": 0.079748184, - "icx": 4.6365406, - "id": 1.46795256, - "idex": 17.78559336, - "idr": 17404.39275569, + "ht": 2.14002875, + "htg": 142.27171534, + "huf": 395.14880431, + "icp": 0.13373492, + "icx": 6.97276307, + "id": 2.40989944, + "idex": 24.37355278, + "idr": 17583.77820903, "iep": 0.787564, - "ils": 4.02616234, - "ilv": 0.010728157, - "imp": 0.85357277, - "imx": 0.50203898, - "index": 0.25362888, - "inj": 0.041116849, - "inr": 89.41560883, - "inv": 0.022611986, - "iost": 113.6415432, - "iota": 4.76956016, - "iotx": 17.78854582, - "iq": 116.11977743, - "iqd": 1402.86968416, - "irr": 44791.13214816, - "isk": 150.30660835, - "itl": 1936.27000001, - "jasmy": 59.54887469, - "jep": 0.85357277, - "jmd": 167.57357074, - "jod": 0.75972907, - "joe": 2.08030129, - "jpy": 168.01665976, - "jst": 32.37483377, - "jto": 0.34824978, - "jup": 809.94211535, - "karrat": 1.68607033, - "kas": 9.37641628, - "kava": 1.54830764, - "kcs": 0.10704495, - "kda": 1.1800217, - "keep": 6.27500146, - "kes": 144.65162039, - "kgs": 95.00577413, - "khr": 4358.01518698, - "klay": 5.60035027, - "kmf": 491.96775, - "knc": 1.81214654, - "kpw": 964.38786015, - "krl": 1.52083735, - "krw": 1475.16383779, - "ksm": 0.035812176, - "kub": 0.54579523, - "kuji": 0.59432367, - "kwd": 0.32998168, - "kyd": 0.87931791, - "kzt": 473.19419905, - "ladys": 6335066.4221441, - "lak": 22989.07257413, - "lbp": 98260.54150281, - "lcx": 3.63248136, - "ldo": 0.48955513, - "leo": 0.18337456, - "link": 0.075766989, - "lit": 1.00049671, - "lkr": 318.75006426, - "loka": 4.03229351, - "loom": 12.30525239, - "lpt": 0.080208234, - "lqty": 0.96274381, - "lrc": 4.24106736, - "lrd": 207.19062576, - "lsd": 0.43146671, - "lseth": 0.00031782596, - "lsk": 0.64139488, - "lsl": 19.9847501, - "ltc": 0.012741109, + "ils": 3.99693504, + "ilv": 0.016674251, + "imp": 0.84616987, + "imx": 0.70296443, + "index": 0.33035538, + "inj": 0.04743847, + "inr": 89.62461552, + "inv": 0.035610448, + "io": 0.32348576, + "iost": 163.97806147, + "iota": 6.07787985, + "iotx": 26.61844552, + "iq": 178.87540466, + "iqd": 1405.1029881, + "irr": 45306.52430869, + "isk": 149.11087457, + "itl": 1936.26999997, + "jasmy": 36.37658818, + "jep": 0.84616987, + "jmd": 167.05238998, + "jod": 0.76114483, + "joe": 3.30587242, + "jpy": 171.12777341, + "jst": 39.4929914, + "jto": 0.46108308, + "jup": 1290.39314878, + "karrat": 1.51048818, + "kas": 6.95375841, + "kava": 2.35091276, + "kcs": 0.11278266, + "kda": 1.84778467, + "keep": 10.04354537, + "kes": 138.90647366, + "kgs": 93.06840481, + "khr": 4414.84374595, + "klay": 6.81183764, + "kmf": 491.96774999, + "kmno": 36.32852, + "knc": 1.93810534, + "kpw": 966.20228141, + "krl": 2.43763197, + "krw": 1487.94063919, + "ksm": 0.045822671, + "kub": 0.72732016, + "kuji": 0.9772428, + "kwd": 0.32918306, + "kyd": 0.8808925, + "kzt": 501.08995791, + "ladys": 8109825.87935228, + "lak": 23635.97023316, + "lbp": 97346.97292737, + "lcx": 5.4321022, + "ldo": 0.44420322, + "leo": 0.18635163, + "lft": 1419.66888735, + "link": 0.078539425, + "lit": 1.35059438, + "lkr": 327.64753712, + "loka": 5.36425181, + "loom": 19.48814656, + "lpt": 0.065148968, + "lqty": 1.25141908, + "lrc": 6.04995242, + "lrd": 208.31850742, + "lsd": 1.28167372, + "lseth": 0.00030538651, + "lsk": 1.06955695, + "lsl": 19.43103616, + "ltc": 0.015430929, "ltl": 3.4528, "luf": 40.3399, - "luna": 2.34493947, - "lunc": 10115.89744361, - "lusd": 1.07319991, + "luna": 3.24352048, + "lunc": 13101.03562225, + "lusd": 1.07609927, "lvl": 0.7028, - "lyd": 5.2161392, - "lyx": 0.27132628, - "lyxe": 0.26704653, - "mad": 10.83338246, - "magic": 1.39383715, - "mana": 2.43160917, - "manta": 0.5940643, - "mask": 0.31703609, - "math": 2.60884236, - "matic": 1.51351916, - "mav": 2.65261887, - "mavia": 0.28723944, - "mbx": 1.35032186, - "mco2": 1.41672489, - "mdl": 19.07715182, - "mdt": 14.75297033, - "media": 0.04906511, - "meme": 40.82548654, - "meth": 0.00032539346, - "metis": 0.016670535, - "mew": 257.57612845, - "mga": 4762.50270183, - "mgf": 23812.51350916, - "mina": 1.27103038, - "mir": 21.19158625, - "mkd": 61.54479388, - "mkr": 0.00037784634, - "mkusd": 1.0878659, - "mln": 0.050391818, - "mmk": 2252.88950257, - "mmx": 0.52744424, - "mnde": 6.92460097, - "mnt": 3636.96166622, - "mobile": 369.82985332, - "mog": 1750070.49554782, - "mona": 0.0086725877, - "mop": 8.63785827, - "movr": 0.08311608, - "mpl": 0.085623811, - "mro": 422.805859, - "mrs": 0.67154899, - "mru": 42.2805859, - "msol": 0.0066100114, + "lyd": 5.20391434, + "lyx": 0.4468045, + "lyxe": 0.42016843, + "mad": 10.65963517, + "maga": 3923.44867903, + "magic": 1.82268908, + "mana": 3.20768971, + "manta": 1.05437924, + "mask": 0.42186837, + "math": 3.68131322, + "matic": 1.9180481, + "mav": 3.52406632, + "mavia": 0.60397625, + "mbx": 1.77025419, + "mco2": 1.90177254, + "mcoin": 1.44632408, + "mdl": 19.19237411, + "mdt": 21.10378378, + "media": 0.081740008, + "meme": 53.71545097, + "meth": 0.00030924053, + "metis": 0.022708439, + "mew": 287.41901443, + "mga": 4803.94323539, + "mgf": 24019.71617695, + "mina": 1.98077739, + "mir": 34.25041853, + "mkd": 61.53564149, + "mkr": 0.000495769, + "mkusd": 1.09671611, + "mln": 0.063044921, + "mmk": 2252.95259512, + "mmx": 0.52309313, + "mnde": 10.40565032, + "mnt": 3649.07119986, + "mobile": 975.16348774, + "mog": 820725.1742528, + "mona": 0.012022799, + "mop": 8.63265939, + "movr": 0.093255903, + "mpl": 0.087716912, + "mro": 420.72336289, + "mrs": 0.71245398, + "mru": 42.07233629, + "msol": 0.0067916311, "mtl": 0.4293, - "mubi": 8.42077321, - "multi": 1.66995423, - "mur": 49.61429725, - "muse": 0.07125591, - "mvr": 16.45619307, - "mwk": 1865.3807738, - "mx": 0.21548686, - "mxc": 89.7959896, - "mxn": 18.2482778, - "mxv": 2.25051693, - "myr": 5.11053821, - "mzm": 68309.50021394, - "mzn": 68.30950021, - "nad": 19.9847501, - "nct": 49.09883162, - "near": 0.15561618, - "neo": 0.055151331, - "neon": 0.9255105, - "nest": 374.7744914, - "nexo": 0.85247594, - "nft": 2210806.6824471, - "ngn": 1460.88206684, - "nio": 39.61656355, - "nkn": 8.98978188, + "mubi": 23.92661468, + "multi": 8.18851862, + "mur": 50.41665441, + "muse": 0.10385017, + "mvr": 16.51809586, + "mwk": 1860.89927737, + "mx": 0.28091469, + "mxc": 112.05360814, + "mxn": 19.26206836, + "mxv": 2.38049822, + "myr": 5.05490492, + "myth": 3.28532237, + "mzm": 68348.43290958, + "mzn": 68.34843291, + "nad": 19.43103616, + "nct": 64.38710645, + "near": 0.19561046, + "neo": 0.096352046, + "neon": 1.82905451, + "nest": 594.76679119, + "nexo": 0.90943165, + "nft": 2411221.78042495, + "ngn": 1634.61674711, + "nio": 39.49417485, + "nkn": 13.47120452, "nlg": 2.20371, - "nmr": 0.044883016, - "nmt": 0.17534155, - "nok": 11.79322822, - "nos": 0.33424735, - "npr": 143.13203583, - "npxs": 2041.49171201, - "ntrn": 1.47074779, - "nu": 9.26168425, - "nxm": 0.015938826, - "nzd": 1.79554977, - "oas": 16.23863693, - "ocean": 1.18531276, - "ogn": 7.32555373, - "ohm": 0.08769045, - "okb": 0.020693446, - "okt": 0.07424323, - "olas": 0.3934423, - "om": 1.46168517, - "omg": 1.68035916, - "omi": 1774.93526198, - "omni": 0.052073465, - "omr": 0.41254763, - "ondo": 1.37016929, - "one": 55.22874037, - "ong": 1.65870578, - "ont": 2.6683351, - "ooki": 470.93945343, - "op": 0.42286894, - "orai": 0.10551635, - "orca": 0.39691897, - "ordi": 0.025040189, - "orn": 0.63182901, - "osak": 3692405.49700314, - "osmo": 1.20307848, - "ox_old": 145.64144567, - "oxt": 10.39361785, - "paal": 2.90981583, - "pab": 1.07155017, - "pandora": 0.00022365487, - "pax": 1.07211806, - "paxg": 0.00045580432, - "pci": 5.76971329, - "pen": 3.9981147, - "pendle": 0.21921867, - "people": 43.26647811, - "pepe": 143567.786825, - "perp": 1.0218194, - "pgk": 4.07588447, - "php": 61.65008312, - "pixel": 2.56490593, - "pkr": 298.37629989, - "pla": 13.28101257, - "pln": 4.31448514, - "plu": 0.24298912, - "png": 2.81078061, - "pokt": 7.23955891, - "pols": 1.39966301, - "poly": 10.68539748, - "polyx": 2.87253162, - "pond": 51.58036101, - "popcat": 2.44993126, - "pork": 5000135.49992888, - "portal": 1.21073068, - "powr": 3.55240179, - "prime": 0.061698641, - "pro": 0.43397943, - "prom": 0.10750093, - "prq": 8.01782267, + "nmr": 0.057414706, + "nmt": 0.18996517, + "nok": 11.31341539, + "nos": 0.42029777, + "not": 75.68663707, + "npc": 43.35049265, + "npr": 143.46660329, + "npxs": 3238.57386076, + "ntrn": 2.43097348, + "nu": 14.65843242, + "nxm": 0.014382557, + "nzd": 1.75372012, + "oas": 21.89731797, + "ocean": 1.61719385, + "ogn": 10.35197416, + "ohm": 0.087784344, + "okb": 0.026038548, + "okt": 0.095547152, + "olas": 0.67733634, + "om": 1.49990629, + "omg": 3.15275442, + "omi": 2101.71179046, + "omikami": 25.82299732, + "omni": 0.07690176, + "omr": 0.41325788, + "ondo": 0.88551057, + "one": 70.79698154, + "ong": 3.03992924, + "ont": 5.18739491, + "ooki": 616.77072674, + "op": 0.60463221, + "orai": 0.11840611, + "orca": 0.59523493, + "ordi": 0.02993439, + "orn": 0.6871392, + "osak": 4040813.07099206, + "osmo": 1.98182741, + "ox_old": 626.78873182, + "oxt": 14.92223767, + "paal": 4.10694526, + "pab": 1.07354702, + "pandora": 0.00036490971, + "pax": 1.07521406, + "paxg": 0.00046534812, + "pci": 10.89518847, + "pen": 4.09136168, + "pendle": 0.17847221, + "people": 11.9276407, + "pepe": 93207.49751869, + "pepecoin": 0.36037789, + "perp": 1.45225889, + "pgk": 4.1345342, + "php": 63.06031294, + "pixel": 3.97308083, + "pkr": 299.7926301, + "pla": 18.46068656, + "pln": 4.2927365, + "plu": 0.29496016, + "png": 2.93468635, + "pokt": 16.15350498, + "pols": 1.92015559, + "poly": 8.99083686, + "polyx": 3.51671627, + "pond": 58.03540541, + "ponke": 3.53550327, + "popcat": 2.95321279, + "pork": 8695651.32815455, + "portal": 2.12703692, + "powr": 5.14818988, + "prime": 0.114897, + "pro": 0.78041432, + "prom": 0.13755037, + "prq": 12.96684783, "pte": 200.482, - "pundix": 1.68289282, - "pups": 0.039557495, - "pyg": 8000.47687928, - "pyr": 0.24029196, - "pyth": 1.923946, - "pyusd": 1.07260634, - "qar": 3.90044263, - "qi": 67.71236296, - "qnt": 0.010301691, - "qtum": 0.2636359, - "quick": 0.017603379, - "rad": 0.62665614, - "rai": 0.38202567, - "rare": 9.54638753, - "rari": 0.31892321, - "ray": 0.68314805, - "rbn": 0.9204568, - "rei": 12.42781509, - "ren": 17.61849542, - "render": 0.14020437, - "rep": 1.20117511, - "repv2": 1.20117511, - "req": 8.12112164, - "reth": 0.00030130274, - "rgt": 2.64669426, - "rif": 5.72763382, - "rlb": 9.18605932, - "rlc": 0.39260717, - "rly": 95.11573028, - "rndr": 0.13419619, - "rol": 49752.0211699, - "ron": 4.97520212, - "ronin": 0.38026331, - "rose": 11.27091244, - "rpl": 0.049447384, - "rsd": 117.098563, - "rseth": 0.00033566444, - "rsr": 181.46154727, - "rss3": 2.81781566, - "rub": 97.97401696, - "rune": 0.20740104, - "rvn": 34.64460492, - "rwf": 1383.23982668, - "safe": 0.5197061, - "saga": 0.29710085, - "sand": 2.39964738, - "sar": 4.01831315, - "sats": 3719429.19962816, - "savax": 0.026336647, - "sbd": 8.94255078, - "sc": 146.5639087, - "scr": 14.73236539, - "sdd": 62735.44372216, - "sdg": 627.35443722, - "seam": 0.20731737, - "sei": 1.68553991, - "sek": 11.72436681, - "sfp": 1.34288756, - "sfrxeth": 0.0003081263, - "sfund": 0.38876165, - "sgb": 108.73905156, - "sgd": 1.45790038, - "shdw": 1.29810055, - "shib": 43890.61196518, - "shp": 0.85357277, - "shping": 119.52950363, + "pundix": 2.92668666, + "pups": 0.15402206, + "pyg": 8062.82137655, + "pyr": 0.29009862, + "pyth": 3.34410065, + "pyusd": 1.07468132, + "qar": 3.90771114, + "qi": 76.89561325, + "qnt": 0.014465083, + "qtum": 0.42663193, + "quick": 0.023971697, + "rad": 0.94595154, + "rai": 0.37804754, + "rare": 11.42794039, + "rari": 0.52759459, + "ray": 0.72623968, + "rbn": 2.08129144, + "rei": 21.88914598, + "ren": 22.63049054, + "render": 0.14727778, + "rep": 1.31336844, + "repv2": 1.31336844, + "req": 9.94585456, + "reth": 0.00028833406, + "rgt": 4.26071021, + "rif": 11.13843707, + "rlb": 14.6421429, + "rlc": 0.50037517, + "rly": 145.18795978, + "rndr": 0.14163573, + "rol": 49771.68070917, + "ron": 4.97716807, + "ronin": 0.48658736, + "rose": 11.7025996, + "rpl": 0.046912111, + "rsd": 117.07159786, + "rseth": 0.00031779693, + "rsr": 189.43647595, + "rss3": 3.9615001, + "rub": 95.7683419, + "rune": 0.26209072, + "rvn": 55.03938713, + "rwf": 1403.33556693, + "safe": 0.78331813, + "saga": 0.71438575, + "sand": 3.26395921, + "sar": 4.02580131, + "sats": 6409268.30457592, + "savax": 0.037708768, + "sbd": 8.95440327, + "sc": 244.08008772, + "scr": 14.70540398, + "sdd": 64508.80303013, + "sdg": 645.0880303, + "seam": 0.27611388, + "sei": 2.94232666, + "sek": 11.24536382, + "sfp": 1.42019762, + "sfrxeth": 0.00029402757, + "sfund": 0.66543982, + "sgb": 117.09212553, + "sgd": 1.45200377, + "shdw": 2.18889908, + "shib": 62746.36026173, + "shp": 0.84616987, + "shping": 153.44504788, "sit": 239.64, "skk": 30.126, - "skl": 12.62169611, - "sle": 24.37585, - "slerf": 3.09957511, - "sll": 24375.85000097, - "slp": 268.45222934, - "snt": 27.21239223, - "snx": 0.3661983, - "sol": 0.0077074573, - "sos": 611.70509712, - "spa": 71.75211758, - "spell": 1245.1568673, - "spl": 0.17859169, - "srd": 36.50006771, - "srg": 36500.06770641, - "ssv": 0.02295065, - "std": 24527.34572379, - "steth": 0.00033335715, - "stg": 2.05325357, - "stn": 24.52734572, - "storj": 1.95740616, - "strax": 12.62521965, - "strd": 0.39147419, - "strk": 0.88341467, - "stsol": 0.006587538, - "stx": 0.42432166, - "sui": 0.89421777, - "suku": 6.3482346, - "super": 1.1582792, - "sushi": 1.05434348, - "svc": 9.37606402, - "sweth": 0.00031599517, - "swftc": 224.95685945, - "sxp": 3.10573556, - "sylo": 504.9596756, - "syn": 1.12976489, - "sync": 807.90783601, - "syp": 13932.14009175, - "szl": 19.9847501, - "t": 29.94918949, - "tao": 0.0026441243, - "tel": 386.21583286, - "tet": 0.060275928, - "tfuel": 9.90440964, - "thb": 39.72585866, - "theta": 0.48610457, - "tia": 0.10971455, - "time": 0.034819886, - "tjs": 11.70309408, - "tkx": 0.082216784, - "tmm": 18718.2130958, - "tmt": 3.74364262, - "tnd": 3.37033178, - "tnsr": 1.20809696, - "ton": 0.19874874, - "tone": 1083.5256276, - "top": 2.54830127, - "topia": 29.18646434, - "tor": 0.5105178, - "toshi": 2966.68515429, - "trac": 1.26231829, - "trb": 0.019259202, - "tribe": 2.39419673, - "trl": 34759406.23803774, - "tru": 9.93125116, - "trump": 0.21150562, - "trx": 8.94767108, - "try": 34.75940624, - "ttd": 7.29105131, - "ttt": 352.63615021, - "tusd": 1.07217975, - "tvd": 1.63366611, - "tvk": 6.08870707, - "twd": 34.88121106, - "twt": 1.01931706, - "tzs": 2774.34486744, - "uah": 42.43484495, - "ugx": 4086.06600416, - "uma": 0.39108832, - "unfi": 0.29259391, - "uni": 0.13865321, - "uos": 6.35045819, - "upi": 2447.26119888, - "uqc": 0.12968025, - "usd": 1.07155017, - "usdc": 1.0713927, - "usdd": 1.0993259, - "usde": 1.07470981, - "usdp": 1.07169061, - "usdt": 1.07181054, - "ust": 56.13124191, - "ustc": 56.07261992, - "uyu": 40.91030534, - "uzs": 13541.86436309, - "val": 1936.27000001, - "vanry": 6.28717285, - "vara": 11.09125912, - "veb": 3898401946.4453583, - "ved": 38.98559663, - "vef": 3898559.66250533, - "velo": 6.81451192, - "venom": 2.99695014, - "ves": 38.98559663, - "vet": 26.6196123, - "vgx": 14.3379809, - "vnd": 27100.23449941, - "vnst": 27900.74869985, - "voxel": 4.25484217, - "vr": 50.87481856, - "vtho": 312.7793345, - "vuv": 129.31438037, - "w": 1.57715638, - "wampl": 0.047689453, - "waves": 0.41889048, - "waxl": 0.96334967, - "waxp": 15.9863344, - "wbeth": 0.00032128987, - "wbt": 0.10520639, - "wbtc": 0.000016651805, - "wcfg": 1.62730752, - "weeth": 0.0003218152, - "wemix": 0.65850127, - "whrh": 46037103.57213726, - "wif": 0.38639314, - "wild": 1.39890006, - "wld": 0.22635027, - "wluna": 29054.05135716, - "woo": 3.51240974, - "wst": 2.9582193, - "wzrd": 0.22491757, - "xaf": 655.95700001, - "xag": 0.039617363, - "xai": 1.48427271, - "xau": 0.00045924819, - "xaut": 0.00045785262, - "xbt": 0.000016674285, - "xcd": 2.89394791, - "xch": 0.036170645, - "xcn": 494.95704388, - "xdc": 30.55904314, - "xdr": 0.81319797, - "xec": 21443.71470053, - "xem": 28.50143954, - "xlm": 9.53935225, - "xmon": 0.0016206621, - "xmr": 0.0082346177, - "xof": 655.95700001, - "xpd": 0.0010996104, + "skl": 20.76702128, + "sle": 24.29747175, + "slerf": 4.45504529, + "sll": 24297.47174999, + "slp": 345.03685696, + "snt": 42.22659064, + "snx": 0.53596964, + "sol": 0.008130259, + "sos": 612.51539355, + "spa": 139.92636518, + "spell": 1540.50505775, + "spl": 0.1789245, + "srd": 33.15220382, + "srg": 33152.20382494, + "ssp": 1663.41047053, + "ssv": 0.028256912, + "std": 24767.5054874, + "steth": 0.00032025578, + "stg": 2.76370246, + "stn": 24.76750549, + "storj": 2.84864686, + "strax": 23.73940358, + "strd": 0.8645371, + "strk": 1.47176833, + "stsol": 0.0068856303, + "stx": 0.67457274, + "sui": 1.19419302, + "suku": 13.59917669, + "super": 1.6097742, + "sushi": 1.31462593, + "svc": 9.3935364, + "sweth": 0.00030244405, + "swftc": 216.48452465, + "sxp": 4.30033784, + "sylo": 703.76603301, + "syn": 2.0334375, + "sync": 3615.99373187, + "syp": 13957.72189787, + "szl": 19.43103616, + "t": 47.19362637, + "tao": 0.0038788363, + "tel": 416.08561529, + "tet": 0.11572484, + "tfuel": 14.9481722, + "thb": 39.28431079, + "theta": 0.70428686, + "tia": 0.15997244, + "time": 0.049081371, + "tjs": 11.49306819, + "tkx": 0.10439831, + "tmm": 18806.18155455, + "tmt": 3.76123631, + "tnd": 3.36942198, + "tnsr": 1.7775745, + "ton": 0.14122752, + "tone": 1440.69383326, + "top": 2.53096405, + "topia": 38.89775784, + "tor": 0.66976662, + "toshi": 4080.2382165, + "trac": 1.61427605, + "trb": 0.01052861, + "tribe": 2.26036669, + "trl": 35362984.6668631, + "tru": 7.88582446, + "trump": 0.13382212, + "trx": 8.97908671, + "try": 35.36298467, + "ttd": 7.28094752, + "ttt": 387.77768713, + "turbo": 195.41868961, + "tusd": 1.07596716, + "tvd": 1.61327353, + "tvk": 7.61511455, + "twd": 34.78741845, + "twt": 1.05493845, + "tzs": 2817.47660221, + "uah": 43.53237691, + "ugx": 4008.2765417, + "ultima": 0.00039776601, + "uma": 0.42707041, + "unfi": 0.2117133, + "uni": 0.1158516, + "uos": 10.76439175, + "upi": 3763.37323489, + "uqc": 0.16485941, + "usd": 1.07354702, + "usdb": 1.07095103, + "usdc": 1.07361114, + "usdd": 1.08174349, + "usde": 1.07418749, + "usdp": 1.07387642, + "usdt": 1.07423366, + "ust": 60.46573211, + "ustc": 60.51442531, + "uyu": 42.38487845, + "uzs": 13523.13813392, + "val": 1936.26999997, + "vanry": 7.57002606, + "vara": 26.13571081, + "veb": 3899765059.855878, + "ved": 38.99931917, + "vef": 3899931.91677196, + "velo": 11.00733033, + "venom": 7.45474058, + "ves": 38.99931917, + "vet": 42.20247073, + "vgx": 14.74756153, + "vnd": 27279.97193071, + "vnst": 27922.10357246, + "voxel": 6.31376066, + "vr": 123.32540889, + "vtho": 443.01836187, + "vuv": 128.47793452, + "w": 3.04367088, + "wampl": 0.05019425, + "waves": 1.16505069, + "waxl": 1.87783997, + "waxp": 27.49218292, + "wbeth": 0.00030737614, + "wbt": 0.11620147, + "wbtc": 0.000017755075, + "wcfg": 2.32896963, + "weeth": 0.0003080612, + "wemix": 1.02549133, + "wif": 0.58279836, + "wild": 2.84660821, + "wld": 0.36930745, + "wluna": 39413.71090167, + "woo": 5.04556863, + "wst": 2.93542008, + "wzrd": 0.27559765, + "xaf": 655.95699999, + "xag": 0.03639313, + "xai": 2.19830521, + "xau": 0.00046100986, + "xaut": 0.00046026683, + "xbt": 0.000017792431, + "xcd": 2.89919448, + "xch": 0.044932799, + "xcn": 652.67781155, + "xdc": 33.71393634, + "xdr": 0.81499913, + "xec": 33914.27035316, + "xem": 75.07024164, + "xlm": 11.96208897, + "xmon": 0.0012118834, + "xmr": 0.0066528307, + "xof": 655.95699999, + "xpd": 0.0010809647, "xpf": 119.33174224, - "xpt": 0.0011250431, - "xrd": 21.91720493, - "xrp": 2.07554651, - "xt": 0.33968281, - "xtz": 1.08309937, - "xvs": 0.10411051, - "xyo": 125.84638873, - "yer": 268.08154209, - "yfi": 0.00015612957, - "yfii": 0.0022403783, - "ygg": 1.2759784, - "zar": 19.9847501, - "zbc": 38.62359443, - "zec": 0.047651756, - "zen": 0.12359654, - "zeta": 0.88582458, - "zil": 43.66066155, - "zmk": 28563.51877077, - "zmw": 28.56351877, - "zrx": 2.15571674, - "zwd": 387.79400801, - "zwl": 32983.92465866, - "zypto": 37.01386694 + "xpt": 0.0010720814, + "xrd": 38.22709987, + "xrp": 2.26486605, + "xt": 0.31563027, + "xtz": 1.37870046, + "xvs": 0.1707765, + "xyo": 165.05073021, + "yer": 268.60511493, + "yfi": 0.00018521144, + "yfii": 0.0027468277, + "ygg": 1.82976935, + "zar": 19.43103616, + "zbc": 59.44722645, + "zec": 0.054788532, + "zen": 0.1656875, + "zeta": 1.24043094, + "zil": 62.00032369, + "zk": 6.30293626, + "zmk": 27351.35947321, + "zmw": 27.35135947, + "zro": 0.37765745, + "zrx": 2.97872193, + "zwd": 388.51666542, + "zwl": 14.54336123, + "zypto": 56.62063054 } } \ No newline at end of file diff --git a/docs/reference/Doxyfile b/docs/reference/Doxyfile index 6ec1df55..bfb3f32a 100644 --- a/docs/reference/Doxyfile +++ b/docs/reference/Doxyfile @@ -42,7 +42,7 @@ DOXYFILE_ENCODING = UTF-8 # title of most generated pages and in a few other places. # The default value is: My Project. -PROJECT_NAME = libqalculate-5.1.1 +PROJECT_NAME = libqalculate-5.2.0 # The PROJECT_NUMBER tag can be used to enter a project or revision number. This # could be handy for archiving the generated documentation or if some version diff --git a/libqalculate/Calculator-definitions.cc b/libqalculate/Calculator-definitions.cc index 918f3c57..b052569d 100644 --- a/libqalculate/Calculator-definitions.cc +++ b/libqalculate/Calculator-definitions.cc @@ -834,7 +834,7 @@ int Calculator::loadDefinitions(const char* file_name, bool is_user_defs, bool c xmlFreeDoc(doc); return false; } - int version_numbers[] = {5, 1, 1}; + int version_numbers[] = {5, 2, 0}; parse_qalculate_version(version, version_numbers); bool new_names = version_numbers[0] > 0 || version_numbers[1] > 9 || (version_numbers[1] == 9 && version_numbers[2] >= 4); diff --git a/libqalculate/Calculator.cc b/libqalculate/Calculator.cc index dfc17364..1f2e3d94 100644 --- a/libqalculate/Calculator.cc +++ b/libqalculate/Calculator.cc @@ -189,13 +189,13 @@ Calculator::Calculator() { srand(time(NULL)); exchange_rates_time[0] = 0; - exchange_rates_time[1] = (time_t) 476232L * (time_t) 3600; + exchange_rates_time[1] = (time_t) 477576L * (time_t) 3600; exchange_rates_time[2] = 0; - priv->exchange_rates_time2[0] = (time_t) 476232L * (time_t) 3600; + priv->exchange_rates_time2[0] = (time_t) 477576L * (time_t) 3600; exchange_rates_check_time[0] = 0; - exchange_rates_check_time[1] = (time_t) 476232L * (time_t) 3600; + exchange_rates_check_time[1] = (time_t) 477576L * (time_t) 3600; exchange_rates_check_time[2] = 0; - priv->exchange_rates_check_time2[0] = (time_t) 476232L * (time_t) 3600; + priv->exchange_rates_check_time2[0] = (time_t) 477576L * (time_t) 3600; b_exchange_rates_warning_enabled = true; b_exchange_rates_used = 0; priv->exchange_rates_url3 = 0; @@ -451,13 +451,13 @@ Calculator::Calculator(bool ignore_locale) { srand(time(NULL)); exchange_rates_time[0] = 0; - exchange_rates_time[1] = (time_t) 476232L * (time_t) 3600; + exchange_rates_time[1] = (time_t) 477576L * (time_t) 3600; exchange_rates_time[2] = 0; - priv->exchange_rates_time2[0] = (time_t) 476232L * (time_t) 3600; + priv->exchange_rates_time2[0] = (time_t) 477576L * (time_t) 3600; exchange_rates_check_time[0] = 0; - exchange_rates_check_time[1] = (time_t) 476232L * (time_t) 3600; + exchange_rates_check_time[1] = (time_t) 477576L * (time_t) 3600; exchange_rates_check_time[2] = 0; - priv->exchange_rates_check_time2[0] = (time_t) 476232L * (time_t) 3600; + priv->exchange_rates_check_time2[0] = (time_t) 477576L * (time_t) 3600; b_exchange_rates_warning_enabled = true; b_exchange_rates_used = 0; priv->exchange_rates_url3 = 0; @@ -1921,11 +1921,11 @@ void Calculator::addBuiltinFunctions() { } void Calculator::addBuiltinUnits() { u_euro = addUnit(new Unit(_("Currency"), "EUR", "euros", "euro", "European Euros", false, true, true)); - u_btc = addUnit(new AliasUnit(_("Currency"), "BTC", "bitcoins", "bitcoin", "Bitcoins", u_euro, "59616.0", 1, "", false, true, true)); + u_btc = addUnit(new AliasUnit(_("Currency"), "BTC", "bitcoins", "bitcoin", "Bitcoins", u_euro, "56208.6", 1, "", false, true, true)); u_btc->setApproximate(); u_btc->setPrecision(-2); u_btc->setChanged(false); - priv->u_byn = addUnit(new AliasUnit(_("Currency"), "BYN", "", "", "Belarusian Ruble", u_euro, "1/3.50451", 1, "", false, true, true)); + priv->u_byn = addUnit(new AliasUnit(_("Currency"), "BYN", "", "", "Belarusian Ruble", u_euro, "1/3.50960", 1, "", false, true, true)); priv->u_byn->setHidden(true); priv->u_byn->setApproximate(); priv->u_byn->setPrecision(-2); diff --git a/libqalculate/MathStructure-calculate.cc b/libqalculate/MathStructure-calculate.cc index 0755d58d..d10c7856 100644 --- a/libqalculate/MathStructure-calculate.cc +++ b/libqalculate/MathStructure-calculate.cc @@ -6059,37 +6059,53 @@ bool MathStructure::calculatesub(const EvaluationOptions &eo, const EvaluationOp } } if(b) break; - if(!CHILD(0).isNumber() && CHILD(1).isNumber() && CHILD(0).representsInteger() && CHILD(1).number().isReal() && CHILD(1).number().isNonInteger()) { - switch(ct_comp) { - case COMPARISON_EQUALS: { - clear(true); - b = true; - break; - } - case COMPARISON_NOT_EQUALS: { - set(1, 1, 0, true); - b = true; - break; - } - case COMPARISON_LESS: {} - case COMPARISON_EQUALS_LESS: { - if(CHILD(1).number().floor()) { - CHILD(1).numberUpdated(); + if(!CHILD(0).isNumber() && CHILD(1).isNumber() && CHILD(0).representsInteger() && CHILD(1).number().isReal()) { + if(CHILD(1).number().isInteger()) { + if(ct_comp == COMPARISON_LESS) { + if(CHILD(1).number().subtract(1)) { b = true; ct_comp = COMPARISON_EQUALS_LESS; calculatesub(eo, feo, false, mparent, index_this); } - break; - } - case COMPARISON_GREATER: {} - case COMPARISON_EQUALS_GREATER: { - if(CHILD(1).number().ceil()) { - CHILD(1).numberUpdated(); + } else if(ct_comp == COMPARISON_GREATER) { + if(CHILD(1).number().add(1)) { b = true; ct_comp = COMPARISON_EQUALS_GREATER; calculatesub(eo, feo, false, mparent, index_this); } - break; + } + } else if(CHILD(1).number().isNonInteger()) { + switch(ct_comp) { + case COMPARISON_EQUALS: { + clear(true); + b = true; + break; + } + case COMPARISON_NOT_EQUALS: { + set(1, 1, 0, true); + b = true; + break; + } + case COMPARISON_LESS: {} + case COMPARISON_EQUALS_LESS: { + if(CHILD(1).number().floor()) { + CHILD(1).numberUpdated(); + b = true; + ct_comp = COMPARISON_EQUALS_LESS; + calculatesub(eo, feo, false, mparent, index_this); + } + break; + } + case COMPARISON_GREATER: {} + case COMPARISON_EQUALS_GREATER: { + if(CHILD(1).number().ceil()) { + CHILD(1).numberUpdated(); + b = true; + ct_comp = COMPARISON_EQUALS_GREATER; + calculatesub(eo, feo, false, mparent, index_this); + } + break; + } } } if(b) break; diff --git a/libqalculate/MathStructure-isolatex.cc b/libqalculate/MathStructure-isolatex.cc index b8910401..b4097197 100644 --- a/libqalculate/MathStructure-isolatex.cc +++ b/libqalculate/MathStructure-isolatex.cc @@ -4002,7 +4002,7 @@ bool MathStructure::isolate_x_sub(const EvaluationOptions &eo, EvaluationOptions if(mtest[0].calculateRaise(nrexp, eo2)) { mtest[1].calculateRaise(nrexp, eo2); mtest.childrenUpdated(); - if(mtest.isolate_x(eo2, eo, x_var, NULL, depth + 1)) { + if(mtest.isolate_x(eo2, eo, x_var, false, depth + 1)) { ComparisonType ct_comp_bak = ct_comp; if((mtest.isLogicalAnd() || mtest.isLogicalOr() || mtest.isComparison()) && test_comparisons(*this, mtest, x_var, eo, false, eo.expand ? 1 : 2) < 0) { if(eo.expand) { diff --git a/libqalculate/MathStructure.cc b/libqalculate/MathStructure.cc index 332ae17b..5b10e68b 100644 --- a/libqalculate/MathStructure.cc +++ b/libqalculate/MathStructure.cc @@ -1053,22 +1053,15 @@ bool MathStructure::representsFinite(bool allow_units) const { } case STRUCT_UNIT: {return allow_units;} case STRUCT_DATETIME: {return allow_units;} - case STRUCT_ADDITION: { - for(size_t i = 0; i < SIZE; i++) { - if(!CHILD(i).representsFinite(allow_units)) return false; - } - return true; - } + case STRUCT_ADDITION: {} case STRUCT_MULTIPLICATION: { for(size_t i = 0; i < SIZE; i++) { - if(!CHILD(i).representsFinite(allow_units)) { - return false; - } + if(!CHILD(i).representsFinite(allow_units)) return false; } return true; } case STRUCT_POWER: { - return (CHILD(0).representsFinite(allow_units) && (CHILD(1).representsFinite(false) || (CHILD(1).isNumber() && CHILD(1).number().isMinusInfinity() && CHILD(0).representsNonZero()))); + return CHILD(0).representsFinite(allow_units) && CHILD(1).representsFinite(false) && (CHILD(1).representsPositive(false) || CHILD(0).representsNonZero(allow_units)); } default: {return false;} } diff --git a/libqalculate/includes.h b/libqalculate/includes.h index 6538954d..2a1a1825 100644 --- a/libqalculate/includes.h +++ b/libqalculate/includes.h @@ -31,8 +31,8 @@ #include #define QALCULATE_MAJOR_VERSION (5) -#define QALCULATE_MINOR_VERSION (1) -#define QALCULATE_MICRO_VERSION (1) +#define QALCULATE_MINOR_VERSION (2) +#define QALCULATE_MICRO_VERSION (0) static std::string empty_string; diff --git a/m4/libtool.m4 b/m4/libtool.m4 index 717e7697..c5be6436 100644 --- a/m4/libtool.m4 +++ b/m4/libtool.m4 @@ -1,6 +1,6 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # -# Copyright (C) 1996-2001, 2003-2019, 2021-2022 Free Software +# Copyright (C) 1996-2001, 2003-2019, 2021-2024 Free Software # Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # @@ -9,13 +9,13 @@ # modifications, as long as this notice is preserved. m4_define([_LT_COPYING], [dnl -# Copyright (C) 2014 Free Software Foundation, Inc. +# Copyright (C) 2024 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. # GNU Libtool 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 2 of of the License, or +# the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # # As a special exception to the GNU General Public License, if you @@ -32,7 +32,7 @@ m4_define([_LT_COPYING], [dnl # along with this program. If not, see . ]) -# serial 59 LT_INIT +# serial 61 LT_INIT # LT_PREREQ(VERSION) @@ -616,7 +616,7 @@ m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT # LT_OUTPUT # --------- # This macro allows early generation of the libtool script (before -# AC_OUTPUT is called), incase it is used in configure for compilation +# AC_OUTPUT is called), in case it is used in configure for compilation # tests. AC_DEFUN([LT_OUTPUT], [: ${CONFIG_LT=./config.lt} @@ -651,9 +651,9 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) configured by $[0], generated by m4_PACKAGE_STRING. -Copyright (C) 2011 Free Software Foundation, Inc. +Copyright (C) 2024 Free Software Foundation, Inc. This config.lt script is free software; the Free Software Foundation -gives unlimited permision to copy, distribute and modify it." +gives unlimited permission to copy, distribute and modify it." while test 0 != $[#] do @@ -1255,7 +1255,9 @@ lt_sysroot= case $with_sysroot in #( yes) if test yes = "$GCC"; then - lt_sysroot=`$CC --print-sysroot 2>/dev/null` + # Trim trailing / since we'll always append absolute paths and we want + # to avoid //, if only for less confusing output for the user. + lt_sysroot=`$CC --print-sysroot 2>/dev/null | $SED 's:/\+$::'` fi ;; #( /*) @@ -1367,7 +1369,7 @@ mips64*-*linux*) ;; x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ -s390*-*linux*|s390*-*tpf*|sparc*-*linux*) +s390*-*linux*|s390*-*tpf*|sparc*-*linux*|x86_64-gnu*) # Find out what ABI is being produced by ac_compile, and set linker # options accordingly. Note that the listed cases only cover the # situations where additional linker options are needed (such as when @@ -1382,7 +1384,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) x86_64-*kfreebsd*-gnu) LD="${LD-ld} -m elf_i386_fbsd" ;; - x86_64-*linux*) + x86_64-*linux*|x86_64-gnu*) case `$FILECMD conftest.o` in *x86-64*) LD="${LD-ld} -m elf32_x86_64" @@ -1411,7 +1413,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) x86_64-*kfreebsd*-gnu) LD="${LD-ld} -m elf_x86_64_fbsd" ;; - x86_64-*linux*) + x86_64-*linux*|x86_64-gnu*) LD="${LD-ld} -m elf_x86_64" ;; powerpcle-*linux*) @@ -1494,7 +1496,7 @@ _LT_DECL([], [AR], [1], [The archiver]) # Use ARFLAGS variable as AR's operation code to sync the variable naming with # Automake. If both AR_FLAGS and ARFLAGS are specified, AR_FLAGS should have -# higher priority because thats what people were doing historically (setting +# higher priority because that's what people were doing historically (setting # ARFLAGS for automake and AR_FLAGS for libtool). FIXME: Make the AR_FLAGS # variable obsoleted/removed. @@ -1555,15 +1557,8 @@ old_postinstall_cmds='chmod 644 $oldlib' old_postuninstall_cmds= if test -n "$RANLIB"; then - case $host_os in - bitrig* | openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" - ;; - *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" - ;; - esac old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" fi case $host_os in @@ -1702,7 +1697,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl lt_cv_sys_max_cmd_len=-1; ;; - cygwin* | mingw* | cegcc*) + cygwin* | mingw* | windows* | cegcc*) # On Win9x/ME, this test blows up -- it succeeds, but takes # about 5 minutes as the teststring grows exponentially. # Worse, since 9x/ME are not pre-emptively multitasking, @@ -1724,7 +1719,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl lt_cv_sys_max_cmd_len=8192; ;; - bitrig* | darwin* | dragonfly* | freebsd* | midnightbsd* | netbsd* | openbsd*) + darwin* | dragonfly* | freebsd* | midnightbsd* | netbsd* | openbsd*) # This has been around since 386BSD, at least. Likely further. if test -x /sbin/sysctl; then lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` @@ -1945,7 +1940,7 @@ else lt_cv_dlopen_self=yes ;; - mingw* | pw32* | cegcc*) + mingw* | windows* | pw32* | cegcc*) lt_cv_dlopen=LoadLibrary lt_cv_dlopen_libs= ;; @@ -2313,7 +2308,7 @@ if test yes = "$GCC"; then *) lt_awk_arg='/^libraries:/' ;; esac case $host_os in - mingw* | cegcc*) lt_sed_strip_eq='s|=\([[A-Za-z]]:\)|\1|g' ;; + mingw* | windows* | cegcc*) lt_sed_strip_eq='s|=\([[A-Za-z]]:\)|\1|g' ;; *) lt_sed_strip_eq='s|=/|/|g' ;; esac lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq` @@ -2371,7 +2366,7 @@ BEGIN {RS = " "; FS = "/|\n";} { # AWK program above erroneously prepends '/' to C:/dos/paths # for these hosts. case $host_os in - mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ + mingw* | windows* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\ $SED 's|/\([[A-Za-z]]:\)|\1|g'` ;; esac sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP` @@ -2540,7 +2535,7 @@ bsdi[[45]]*) # libtool to hard-code these into programs ;; -cygwin* | mingw* | pw32* | cegcc*) +cygwin* | mingw* | windows* | pw32* | cegcc*) version_type=windows shrext_cmds=.dll need_version=no @@ -2572,7 +2567,7 @@ cygwin* | mingw* | pw32* | cegcc*) m4_if([$1], [],[ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) ;; - mingw* | cegcc*) + mingw* | windows* | cegcc*) # MinGW DLLs use traditional 'lib' prefix soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' ;; @@ -2591,7 +2586,7 @@ m4_if([$1], [],[ library_names_spec='$libname.dll.lib' case $build_os in - mingw*) + mingw* | windows*) sys_lib_search_path_spec= lt_save_ifs=$IFS IFS=';' @@ -2839,7 +2834,7 @@ linux*android*) version_type=none # Android doesn't support versioned libraries. need_lib_prefix=no need_version=no - library_names_spec='$libname$release$shared_ext' + library_names_spec='$libname$release$shared_ext $libname$shared_ext' soname_spec='$libname$release$shared_ext' finish_cmds= shlibpath_var=LD_LIBRARY_PATH @@ -2851,8 +2846,9 @@ linux*android*) hardcode_into_libs=yes dynamic_linker='Android linker' - # Don't embed -rpath directories since the linker doesn't support them. - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' + # -rpath works at least for libraries that are not overridden by + # libraries installed in system locations. + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' ;; # This must be glibc/ELF. @@ -2886,7 +2882,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) # before this can be enabled. hardcode_into_libs=yes - # Ideally, we could use ldconfig to report *all* directores which are + # Ideally, we could use ldconfig to report *all* directories which are # searched for libraries, however this is still not possible. Aside from not # being certain /sbin/ldconfig is available, command # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64, @@ -2943,7 +2939,7 @@ newsos6) dynamic_linker='ldqnx.so' ;; -openbsd* | bitrig*) +openbsd*) version_type=sunos sys_lib_dlsearch_path_spec=/usr/lib need_lib_prefix=no @@ -3275,7 +3271,7 @@ if test yes = "$GCC"; then # Check if gcc -print-prog-name=ld gives a path. AC_MSG_CHECKING([for ld used by $CC]) case $host in - *-*-mingw*) + *-*-mingw* | *-*-windows*) # gcc leaves a trailing carriage return, which upsets mingw ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; *) @@ -3384,7 +3380,7 @@ case $reload_flag in esac reload_cmds='$LD$reload_flag -o $output$reload_objs' case $host_os in - cygwin* | mingw* | pw32* | cegcc*) + cygwin* | mingw* | windows* | pw32* | cegcc*) if test yes != "$GCC"; then reload_cmds=false fi @@ -3456,7 +3452,6 @@ lt_cv_deplibs_check_method='unknown' # 'none' -- dependencies not supported. # 'unknown' -- same as none, but documents that we really don't know. # 'pass_all' -- all dependencies passed with no checks. -# 'test_compile' -- check by making test program. # 'file_magic [[regex]]' -- check by looking for files in library path # that responds to the $file_magic_cmd with a given extended regex. # If you have 'file' or equivalent on your system and you're not sure @@ -3483,7 +3478,7 @@ cygwin*) lt_cv_file_magic_cmd='func_win32_libid' ;; -mingw* | pw32*) +mingw* | windows* | pw32*) # Base MSYS/MinGW do not provide the 'file' command needed by # func_win32_libid shell function, so use a weaker test based on 'objdump', # unless we find 'file', for example because we are cross-compiling. @@ -3583,7 +3578,7 @@ newos6*) lt_cv_deplibs_check_method=pass_all ;; -openbsd* | bitrig*) +openbsd*) if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' else @@ -3647,7 +3642,7 @@ file_magic_glob= want_nocaseglob=no if test "$build" = "$host"; then case $host_os in - mingw* | pw32*) + mingw* | windows* | pw32*) if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then want_nocaseglob=yes else @@ -3699,7 +3694,7 @@ else # Tru64's nm complains that /dev/null is an invalid object file # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty case $build_os in - mingw*) lt_bad_file=conftest.nm/nofile ;; + mingw* | windows*) lt_bad_file=conftest.nm/nofile ;; *) lt_bad_file=/dev/null ;; esac case `"$tmp_nm" -B $lt_bad_file 2>&1 | $SED '1q'` in @@ -3790,7 +3785,7 @@ lt_cv_sharedlib_from_linklib_cmd, [lt_cv_sharedlib_from_linklib_cmd='unknown' case $host_os in -cygwin* | mingw* | pw32* | cegcc*) +cygwin* | mingw* | windows* | pw32* | cegcc*) # two different shell functions defined in ltmain.sh; # decide which one to use based on capabilities of $DLLTOOL case `$DLLTOOL --help 2>&1` in @@ -3822,16 +3817,16 @@ _LT_DECL([], [sharedlib_from_linklib_cmd], [1], m4_defun([_LT_PATH_MANIFEST_TOOL], [AC_CHECK_TOOL(MANIFEST_TOOL, mt, :) test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt -AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool], - [lt_cv_path_mainfest_tool=no +AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_manifest_tool], + [lt_cv_path_manifest_tool=no echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out cat conftest.err >&AS_MESSAGE_LOG_FD if $GREP 'Manifest Tool' conftest.out > /dev/null; then - lt_cv_path_mainfest_tool=yes + lt_cv_path_manifest_tool=yes fi rm -f conftest*]) -if test yes != "$lt_cv_path_mainfest_tool"; then +if test yes != "$lt_cv_path_manifest_tool"; then MANIFEST_TOOL=: fi _LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl @@ -3860,7 +3855,7 @@ AC_DEFUN([LT_LIB_M], [AC_REQUIRE([AC_CANONICAL_HOST])dnl LIBM= case $host in -*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*) +*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-mingw* | *-*-pw32* | *-*-darwin*) # These system don't have libm, or don't need it ;; *-ncr-sysv4.3*) @@ -3935,7 +3930,7 @@ case $host_os in aix*) symcode='[[BCDT]]' ;; -cygwin* | mingw* | pw32* | cegcc*) +cygwin* | mingw* | windows* | pw32* | cegcc*) symcode='[[ABCDGISTW]]' ;; hpux*) @@ -3950,7 +3945,7 @@ osf*) symcode='[[BCDEGQRST]]' ;; solaris*) - symcode='[[BDRT]]' + symcode='[[BCDRT]]' ;; sco3.2v5*) symcode='[[DT]]' @@ -4014,7 +4009,7 @@ $lt_c_name_lib_hook\ # Handle CRLF in mingw tool chain opt_cr= case $build_os in -mingw*) +mingw* | windows*) opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp ;; esac @@ -4241,7 +4236,7 @@ m4_if([$1], [CXX], [ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) # PIC is the default for these OSes. ;; - mingw* | cygwin* | os2* | pw32* | cegcc*) + mingw* | windows* | cygwin* | os2* | pw32* | cegcc*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). # Although the cygwin gcc ignores -fPIC, still need this for old-style @@ -4317,7 +4312,7 @@ m4_if([$1], [CXX], [ ;; esac ;; - mingw* | cygwin* | os2* | pw32* | cegcc*) + mingw* | windows* | cygwin* | os2* | pw32* | cegcc*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). m4_if([$1], [GCJ], [], @@ -4565,7 +4560,7 @@ m4_if([$1], [CXX], [ # PIC is the default for these OSes. ;; - mingw* | cygwin* | pw32* | os2* | cegcc*) + mingw* | windows* | cygwin* | pw32* | os2* | cegcc*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). # Although the cygwin gcc ignores -fPIC, still need this for old-style @@ -4669,7 +4664,7 @@ m4_if([$1], [CXX], [ esac ;; - mingw* | cygwin* | pw32* | os2* | cegcc*) + mingw* | windows* | cygwin* | pw32* | os2* | cegcc*) # This hack is so that the source file can tell whether it is being # built for inclusion in a dll (and should export symbols for example). m4_if([$1], [GCJ], [], @@ -4711,6 +4706,12 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' ;; + *flang) + # Flang compiler. + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; # icc used to be incompatible with GCC. # ICC 10 doesn't accept -KPIC any more. icc* | ifort*) @@ -4944,7 +4945,7 @@ m4_if([$1], [CXX], [ pw32*) _LT_TAGVAR(export_symbols_cmds, $1)=$ltdll_cmds ;; - cygwin* | mingw* | cegcc*) + cygwin* | mingw* | windows* | cegcc*) case $cc_basename in cl* | icl*) _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' @@ -5002,7 +5003,7 @@ dnl Note also adjust exclude_expsyms for C++ above. extract_expsyms_cmds= case $host_os in - cygwin* | mingw* | pw32* | cegcc*) + cygwin* | mingw* | windows* | pw32* | cegcc*) # FIXME: the MSVC++ and ICC port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++ or Intel C++ Compiler. @@ -5014,7 +5015,7 @@ dnl Note also adjust exclude_expsyms for C++ above. # we just hope/assume this is gcc and not c89 (= MSVC++ or ICC) with_gnu_ld=yes ;; - openbsd* | bitrig*) + openbsd*) with_gnu_ld=no ;; esac @@ -5117,7 +5118,7 @@ _LT_EOF fi ;; - cygwin* | mingw* | pw32* | cegcc*) + cygwin* | mingw* | windows* | pw32* | cegcc*) # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, # as there is no search path for DLLs. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' @@ -5173,7 +5174,7 @@ _LT_EOF cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ emximp -o $lib $output_objdir/$libname.def' - _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes _LT_TAGVAR(file_list_spec, $1)='@' ;; @@ -5574,7 +5575,7 @@ _LT_EOF _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic ;; - cygwin* | mingw* | pw32* | cegcc*) + cygwin* | mingw* | windows* | pw32* | cegcc*) # When not using gcc, we currently assume that we are using # Microsoft Visual C++ or Intel C++ Compiler. # hardcode_libdir_flag_spec is actually meaningless, as there is @@ -5591,14 +5592,14 @@ _LT_EOF # Tell ltmain to make .dll files, not .so files. shrext_cmds=.dll # FIXME: Setting linknames here is a bad hack. - _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' + _LT_TAGVAR(archive_cmds, $1)='$CC -Fe $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames=' _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then cp "$export_symbols" "$output_objdir/$soname.def"; echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp"; else $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp; fi~ - $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ + $CC -Fe $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~ linknames=' # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' @@ -5836,7 +5837,7 @@ _LT_EOF *nto* | *qnx*) ;; - openbsd* | bitrig*) + openbsd*) if test -f /usr/libexec/ld.so; then _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_shlibpath_var, $1)=no @@ -5879,7 +5880,7 @@ _LT_EOF cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ emximp -o $lib $output_objdir/$libname.def' - _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes _LT_TAGVAR(file_list_spec, $1)='@' ;; @@ -6173,7 +6174,7 @@ _LT_TAGDECL([], [hardcode_direct], [0], _LT_TAGDECL([], [hardcode_direct_absolute], [0], [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes DIR into the resulting binary and the resulting library dependency is - "absolute", i.e impossible to change by setting $shlibpath_var if the + "absolute", i.e. impossible to change by setting $shlibpath_var if the library is relocated]) _LT_TAGDECL([], [hardcode_minus_L], [0], [Set to "yes" if using the -LDIR flag during linking hardcodes DIR @@ -6420,8 +6421,7 @@ if test yes != "$_lt_caught_CXX_error"; then wlarc='$wl' # ancient GNU ld didn't support --whole-archive et. al. - if eval "`$CC -print-prog-name=ld` --help 2>&1" | - $GREP 'no-whole-archive' > /dev/null; then + if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive' else _LT_TAGVAR(whole_archive_flag_spec, $1)= @@ -6441,7 +6441,7 @@ if test yes != "$_lt_caught_CXX_error"; then # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "[[-]]L"' else GXX=no @@ -6650,7 +6650,7 @@ if test yes != "$_lt_caught_CXX_error"; then esac ;; - cygwin* | mingw* | pw32* | cegcc*) + cygwin* | mingw* | windows* | pw32* | cegcc*) case $GXX,$cc_basename in ,cl* | no,cl* | ,icl* | no,icl*) # Native MSVC or ICC @@ -6749,7 +6749,7 @@ if test yes != "$_lt_caught_CXX_error"; then cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~ emximp -o $lib $output_objdir/$libname.def' - _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' + _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes _LT_TAGVAR(file_list_spec, $1)='@' ;; @@ -6817,7 +6817,7 @@ if test yes != "$_lt_caught_CXX_error"; then # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "[[-]]L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) if test yes = "$GXX"; then @@ -6882,7 +6882,7 @@ if test yes != "$_lt_caught_CXX_error"; then # explicitly linking system object files so we need to strip them # from the output so that they don't get included in the library # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' + output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "[[-]]L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"' ;; *) if test yes = "$GXX"; then @@ -7130,7 +7130,7 @@ if test yes != "$_lt_caught_CXX_error"; then _LT_TAGVAR(ld_shlibs, $1)=yes ;; - openbsd* | bitrig*) + openbsd*) if test -f /usr/libexec/ld.so; then _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_shlibpath_var, $1)=no @@ -7221,7 +7221,7 @@ if test yes != "$_lt_caught_CXX_error"; then # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "[[-]]L"' else # FIXME: insert proper C++ library support @@ -7305,7 +7305,7 @@ if test yes != "$_lt_caught_CXX_error"; then # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "[[-]]L"' else # g++ 2.7 appears to require '-G' NOT '-shared' on this # platform. @@ -7316,7 +7316,7 @@ if test yes != "$_lt_caught_CXX_error"; then # Commands to make compiler produce verbose output that lists # what "hidden" libraries, object files and flags are used when # linking a shared library. - output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"' + output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "[[-]]L"' fi _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir' @@ -7554,10 +7554,11 @@ if AC_TRY_EVAL(ac_compile); then case $prev$p in -L* | -R* | -l*) - # Some compilers place space between "-{L,R}" and the path. + # Some compilers place space between "-{L,R,l}" and the path. # Remove the space. - if test x-L = "$p" || - test x-R = "$p"; then + if test x-L = x"$p" || + test x-R = x"$p" || + test x-l = x"$p"; then prev=$p continue fi @@ -8215,7 +8216,7 @@ AC_SUBST([DLLTOOL]) # ---------------- # Check for a file(cmd) program that can be used to detect file type and magic m4_defun([_LT_DECL_FILECMD], -[AC_CHECK_TOOL([FILECMD], [file], [:]) +[AC_CHECK_PROG([FILECMD], [file], [:]) _LT_DECL([], [FILECMD], [1], [A file(cmd) program that detects file types]) ])# _LD_DECL_FILECMD @@ -8231,73 +8232,6 @@ _LT_DECL([], [SED], [1], [A sed program that does not truncate output]) _LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"], [Sed that helps us avoid accidentally triggering echo(1) options like -n]) ])# _LT_DECL_SED - -m4_ifndef([AC_PROG_SED], [ -############################################################ -# NOTE: This macro has been submitted for inclusion into # -# GNU Autoconf as AC_PROG_SED. When it is available in # -# a released version of Autoconf we should remove this # -# macro and use it instead. # -############################################################ - -m4_defun([AC_PROG_SED], -[AC_MSG_CHECKING([for a sed that does not truncate output]) -AC_CACHE_VAL(lt_cv_path_SED, -[# Loop through the user's path and test for sed and gsed. -# Then use that list of sed's as ones to test for truncation. -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for lt_ac_prog in sed gsed; do - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then - lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" - fi - done - done -done -IFS=$as_save_IFS -lt_ac_max=0 -lt_ac_count=0 -# Add /usr/xpg4/bin/sed as it is typically found on Solaris -# along with /bin/sed that truncates output. -for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do - test ! -f "$lt_ac_sed" && continue - cat /dev/null > conftest.in - lt_ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >conftest.in - # Check for GNU sed and select it if it is found. - if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then - lt_cv_path_SED=$lt_ac_sed - break - fi - while true; do - cat conftest.in conftest.in >conftest.tmp - mv conftest.tmp conftest.in - cp conftest.in conftest.nl - echo >>conftest.nl - $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break - cmp -s conftest.out conftest.nl || break - # 10000 chars as input seems more than enough - test 10 -lt "$lt_ac_count" && break - lt_ac_count=`expr $lt_ac_count + 1` - if test "$lt_ac_count" -gt "$lt_ac_max"; then - lt_ac_max=$lt_ac_count - lt_cv_path_SED=$lt_ac_sed - fi - done -done -]) -SED=$lt_cv_path_SED -AC_SUBST([SED]) -AC_MSG_RESULT([$SED]) -])#AC_PROG_SED -])#m4_ifndef - -# Old name: -AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED]) dnl aclocal-1.4 backwards compatibility: dnl AC_DEFUN([LT_AC_PROG_SED], []) @@ -8344,7 +8278,7 @@ AC_CACHE_VAL(lt_cv_to_host_file_cmd, [case $host in *-*-mingw* ) case $build in - *-*-mingw* ) # actually msys + *-*-mingw* | *-*-windows* ) # actually msys lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32 ;; *-*-cygwin* ) @@ -8357,7 +8291,7 @@ AC_CACHE_VAL(lt_cv_to_host_file_cmd, ;; *-*-cygwin* ) case $build in - *-*-mingw* ) # actually msys + *-*-mingw* | *-*-windows* ) # actually msys lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin ;; *-*-cygwin* ) @@ -8383,9 +8317,9 @@ AC_CACHE_VAL(lt_cv_to_tool_file_cmd, [#assume ordinary cross tools, or native build. lt_cv_to_tool_file_cmd=func_convert_file_noop case $host in - *-*-mingw* ) + *-*-mingw* | *-*-windows* ) case $build in - *-*-mingw* ) # actually msys + *-*-mingw* | *-*-windows* ) # actually msys lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32 ;; esac diff --git a/m4/ltoptions.m4 b/m4/ltoptions.m4 index b0b5e9c2..6dfe99f1 100644 --- a/m4/ltoptions.m4 +++ b/m4/ltoptions.m4 @@ -1,6 +1,6 @@ # Helper functions for option handling. -*- Autoconf -*- # -# Copyright (C) 2004-2005, 2007-2009, 2011-2019, 2021-2022 Free +# Copyright (C) 2004-2005, 2007-2009, 2011-2019, 2021-2024 Free # Software Foundation, Inc. # Written by Gary V. Vaughan, 2004 # @@ -8,7 +8,7 @@ # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. -# serial 8 ltoptions.m4 +# serial 9 ltoptions.m4 # This is to help aclocal find these macros, as it can't see m4_define. AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) @@ -128,7 +128,7 @@ LT_OPTION_DEFINE([LT_INIT], [win32-dll], [enable_win32_dll=yes case $host in -*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) +*-*-cygwin* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-cegcc*) AC_CHECK_TOOL(AS, as, false) AC_CHECK_TOOL(DLLTOOL, dlltool, false) AC_CHECK_TOOL(OBJDUMP, objdump, false) diff --git a/m4/ltsugar.m4 b/m4/ltsugar.m4 index 902508bd..5b5c80a3 100644 --- a/m4/ltsugar.m4 +++ b/m4/ltsugar.m4 @@ -1,6 +1,6 @@ # ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- # -# Copyright (C) 2004-2005, 2007-2008, 2011-2019, 2021-2022 Free Software +# Copyright (C) 2004-2005, 2007-2008, 2011-2019, 2021-2024 Free Software # Foundation, Inc. # Written by Gary V. Vaughan, 2004 # diff --git a/m4/ltversion.m4 b/m4/ltversion.m4 index 0026c21c..82887f7c 100644 --- a/m4/ltversion.m4 +++ b/m4/ltversion.m4 @@ -1,6 +1,6 @@ # ltversion.m4 -- version numbers -*- Autoconf -*- # -# Copyright (C) 2004, 2011-2019, 2021-2022 Free Software Foundation, +# Copyright (C) 2004, 2011-2019, 2021-2024 Free Software Foundation, # Inc. # Written by Scott James Remnant, 2004 # @@ -10,15 +10,15 @@ # @configure_input@ -# serial 4249 ltversion.m4 +# serial 4337 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.4.7.4-1ec8f-dirty]) -m4_define([LT_PACKAGE_REVISION], [2.4.7.4]) +m4_define([LT_PACKAGE_VERSION], [2.5.0.1-38c1-dirty]) +m4_define([LT_PACKAGE_REVISION], [2.5.0.1]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4.7.4-1ec8f-dirty' -macro_revision='2.4.7.4' +[macro_version='2.5.0.1-38c1-dirty' +macro_revision='2.5.0.1' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) diff --git a/m4/lt~obsolete.m4 b/m4/lt~obsolete.m4 index 0f7a8759..22b53469 100644 --- a/m4/lt~obsolete.m4 +++ b/m4/lt~obsolete.m4 @@ -1,6 +1,6 @@ # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- # -# Copyright (C) 2004-2005, 2007, 2009, 2011-2019, 2021-2022 Free +# Copyright (C) 2004-2005, 2007, 2009, 2011-2019, 2021-2024 Free # Software Foundation, Inc. # Written by Scott James Remnant, 2004. # diff --git a/src/qalc.cc b/src/qalc.cc index bf6ca7a1..8578df5e 100644 --- a/src/qalc.cc +++ b/src/qalc.cc @@ -7859,7 +7859,7 @@ void load_preferences() { #endif - int version_numbers[] = {5, 1, 1}; + int version_numbers[] = {5, 2, 0}; if(file) { char line[10000];