From d64fdb345240cd7c2c031511ee972d61a07e265b Mon Sep 17 00:00:00 2001 From: Christophe de Dinechin Date: Sat, 27 Jul 2024 16:32:03 +0200 Subject: [PATCH] config: Use config files only for user configuration Switch to using the built-in data files by default, and extending them with teh configuration file. The `ShowBuiltinConstants`, `ShowBuiltinCharacters` and `ShowBuiltinUnits` are not on by default. The size of the corresponding `config/*.csv` files are reduced to a really simple example. Fixes: #1052 Signed-off-by: Christophe de Dinechin --- color-images/char-menu.png | Bin 2454 -> 2437 bytes config/characters.csv | 70 -------- config/constants.csv | 64 ------- config/units.csv | 333 ------------------------------------- images/char-menu.png | Bin 2456 -> 2439 bytes src/characters.cc | 8 +- src/constants.cc | 10 -- src/ids.tbl | 6 +- src/tests.cc | 53 +++--- src/unit.cc | 18 +- 10 files changed, 36 insertions(+), 526 deletions(-) diff --git a/color-images/char-menu.png b/color-images/char-menu.png index 1b09cbeb78abe9493177d8e5b419ba66a5e23b84..7fd34e4b9a702609976a5761ab261c0e2b9cc21b 100644 GIT binary patch delta 2405 zcmV-r37Ynn6NM9yIe#}vL_t(|ob8?4lIti8MeS4b|G%7h$Q+Lfgb+dq;q3L$m3Fvj zbCCsh?ECZiTmS%Y0{_r|?)%R>W<8hMJg5i&D)R7CDz59g zzrO98A@lN3V&>|Q`hVv07soP{^#<3t0;tHtkErN7tl~sL-4+}DUR)%si6L9zah-8>-*hdh zKgb5N_^u7vqFPI;o4_V6k_lDMt0+p)oD^kULIR}?W`?u~!%0@8tbGLm4pCMyyXh_n znABFxrQ+M*J$S*A(PWe@XT{npb(5|3S$a!`%3;qjEq~Un(<4g@+cOC$pH;E;DxrB5 zNzYNOLSp)cwS>l-G+8VB6xbEX*IFo=_Ag4iCR7OJ+r|&gr7vN{uAC;N@PQ^)mK-*s zmR8YHG3Bs|7L@;;FTa%_EKFUI_;Q-r#0LmoP|Gu1QV3&c&nS%hzU7GTAX-|^B||SbED1BnnCIxRB`oe*i61g_ zUj`ezc#{?u&G!E~-1e{zo$$&%nwODNb!#D$%}x#PxXGYPyuiN0Dw@9VuS*A0p8n2b zNekr_boO6mu0_~(-)P=E%xF1+4`GV|0}+;QD1WHAYvHMMzS~3WZ+Sh*Aqh9!001oY5{gJYHt+)evfVw$MfoROA6F@=#m8@J@FC0PtnXVZmDg z0DmH}JFJ{{9s&Sf%>Ua@=Y~tvV?xDVpdt_NQ*qG<>(D^S{RfO&fQmdoMILIi-}ZAS z0Kkh0dI<#p0L+6IsfGd-d4P&M=vClFs-Zwd9-tx*dh_ri)li@!4^WW@y@k2=T#kFs0C{+wcSbHCZ@oVQ34ZB*yOU2&aoL3R^SQVMynHR<- z;pZ>5>@)mM-*ijZzAG`KB7^;3Frq#LZ@Y#qxkMFXOF}l>Eq>hd4ei*vTfY@xn}10N zt!*(d+X}VKtcr_UPS!Gu&$7n(wV?)K72N%*E8+51(Q49emcl~1;U$m5=g8#RuxKmR z!g~DI!%R@b4m?K{wawkJEzFLqnsLhMFRPf{bQh+<4Bf$MKA#BAQ8;1<`-Kt;W7eJ9 z1+%+f)ibbVXZ{FfV_(Q4hdS1wqJLV%^o4D9=&ce|EV)Yf#Fo#{FDz&sAFailm)&cu zJw2;}9+7RMxmt(x(|`fRE+X$7{~VXLK3;qxL@neN(tqYdsQxBm6*OIo1Uwnd9Y5*+Ox zU8JvTD=%CYR(iHHh)sw+!s;$15;7Y1&cKGjXYm3FUsen0E}6YJw+p<8h_FTj$WPSe zGsp7T@KxBkNK4W9M@Z1`9)Dc9g*<3he5YemF&1IXtc|xX3_k?NGKFuG&ke6DQ!8-a z3tKH@g%fe#9iF#gd-=u)OIgixx_)v!=WX_QozbO}CL6u5_8Qsp4BI;^zWVy*mf4@b zw=A&RI(6^38!s0toZD!iRBNmU%uVi)ig&)FBd5-?dY$pqLJeS#w}0qrtjE}l#^F6I z!}X(X%KRa2F`q}X=yTbiL!th+Ymc&D)=8)hW~;9Mw#pGcxAHE+FmhViBWZPnoLHG& z$lm3c$IG;!mP5r}pkg)pU?hWz`FiUTay?!K0MH`&mS_xcSO6RVyww*tEC8}|&@Hd4 z!HZP002O(FiaZoP8h7f88*^25-P%giah*?iZAK*u;iyH9MSY$cBzotcJw(GY5QVG zNLm#`Y*ay8dvpjDXjG`4*1%j`+}A*he!nhg?0#iv4R;lW`+w=o#y>c!V2x2)I4NXa zMZg5#l85Cqb%yyjAdmYfGFo)X+gh`|PzLiYBlP`kr3-Rnhcv6N*~7T>mx3kG1GJg^N_ zH+#`jt-OYv2!F@EcuZx#VnrS<*YS%Srr2gtL0paFj$C+ z*)7$pu@HO54JJz5Bb1`>y8P#e@YN_w`{MrlnB&$s@qZE$Jfbv{LeQuzcAoC+)>txX zRh@n|!kTZv)`rmv8@f=Zym#PwWuG4+@!4DLA2uq&y56hT))nGtgUk72;3X8w`fNdL zHfpg{SB9bR@Qw!8kX&in5#q@9E;#bGhIMGhSYg`p!8Ll1zGdE$kEe^axMZwTG&oC(j8#bEf z>9C$1)93yRP5P^S{c#tg*Fn1Xr>tYX#yrigLB0tn*cd&AYijI>iqS~xEiO>DW_MWQ zFWkc#-4A-@c{MX! XIEQVxhs{s!00000NkvXXu0mjfc!sY| delta 2422 zcmV-+35oWF6P6Q@Ie$n=L_t(|ob8?2mZmxgMzvSJ|0{bg?DC{YAcO!R%D$*&X$HOw zn89Dq>$;94Ns=A-TmEyN=PEn8@EvQauqIW+;cF`XJV%lB9BlJag#)P~4xdtS9LIV4 zwmU-P=^@9$RN+Iah{JbO-2CZ=P~kk!$BA-|Yf8sz4Qns?xMho4#IV%Lw1^FtfXxiXYM>8tw0)PGmm#noIwJ31rz=hQ31(Kb8mXRM| zs$e;+x=aPubjN$lFfs#%;8-%5{-N4Wn#ZGzsursNxtvQUEQ)opP*;R;);t^)15-ll zZp=61(5sv42YFOxlO#!WnQ~a^t&$}1MDDQSJb9QT$w&Bq`Dx$bQt2^M#adED9NwqmC`VYE z4wT&XfJ{jhaYz+$sLg)c&z+Jac`;5Op-7S>nI}J_>Po7JL#l`aUqyaM)s<8chg1;< zzIpi}Raa6)98yIb_!e%nhGqS}j+r0F@_*y{zjdUvP3s51?|660Mk1h=XN()7tJjE2Lkggs$^B`QfyJjx(?1%vCRnUM)!WQ z>b|6wkt7>PyMSn$T zS6vmXDPc4IGk_-!Ky+}XUhfAffLP@j#gRM)F$?Zq>Pk4YRbWNhjRGtz7rg4$qh1$x zM67`}%Nc8Cgra7{(^XL?TW4C=5vHy_Pv@ng0?UQyp+p})D!;*$Nvjz9R6Qn)I3pPL z6Da^=?C$M^+1*QZ55(+@KSEhp7k_liDIM!jQW&}_h@0FD-CL1Qi<0$mzEy;Z;VEHr zm9F-Yz#n&SalqCx78Y1sH@E*LQpU_K4>&{Ut^}EiuKmnJj;f}P-{oH#X;c?X^O}hR zV=zU0tb04wFF@;>k#J13sG%s`K3<0`v#V2Js^B^-x~0lOme6Am+A47ifd}m$XO_?UiI1BjsGE-)zff(Mn{Y@GzXA-@d61q)yApA13zNrB7ZE`@7;|pB=F}KM{FSvoEcvbMkiL6%jUQnG8NpW zhr1ycPW`avLo9ai#YHh+5LHQ|sSQjJ2Yh(oG~1Gv-Vhg3t5D&mkT;!vCYlBZ^qB>4il zhLt4AHsps?T}c&jNELCAJn0@;&oTZYl$fN7IHZa=@Xh-(8et(_BU6PNsUi*^QE{`` z8rG_!r{7dD`W}n04QNP6SQP+T)GjJ$7OE(VceEn_I4UIX!+!!awjS}P^}r=TL972% zUGOBD*!TxU6-{H97ETHgs~{SNKl63rAg5bXDlH0o(SjRY6(%Dr>qjM)l%sm4x(QDH zVqQ#+P~u?ZC5H@{w}DPU&0(EC(3iCOQns)-%nZ(H(nz^LmPYE|9b6#@2i&65eyQo+x(X=nG?-)9jF zN#GM<#Cn4{YfjvzioG4yVK71giPz~rXNXIqn6|L<=YKWFAQyEZqp`5tHJDft^Q`7p z!xIJ5OXJ+zITDDPVkSFJw=OuAj9OKPS94fp<6B$hTG8hV*FQQ|{zHk+SYo~A$_a@r zq*~Z8iB{XQOGMEImAjzAV-0i$N8s07$i~|{5>qL&F~l^!CTu%bWO-d^?h>km@rS<< z7#uKtcz-Bo8QwO1k}PLCG)Gux@%<=pUNIL_YU5wSzPfg?d>1=sSgvvVMfXY0g4MPt z@D3GC1iOc!7_usY1j2@e<|#X@(H(^DlO1-<=NO??@u44|aW;m@)100sdN|<^eE)G3 zf<3jS1Rq6ZzF>nAs|&ZH{`v?@#$E#%i{~(wFmJj}8bRIU6A6OoiV&Fs!~FJDmpq7| zPO6AQs))mzRNUkUD@l@VNQadq$u^|JN|Iz7{yD5T`zZp%zd8;@s)$3XhyyS_KcpIh oR1t?%5r@Xl-8WT|B*_Q)4@$3&ySF4`TmS$707*qoM6N<$f|lBsb^rhX diff --git a/config/characters.csv b/config/characters.csv index 4d4e4939..48c27f81 100644 --- a/config/characters.csv +++ b/config/characters.csv @@ -1,71 +1 @@ -"", "AÀÁÂÃaàáâãÄÅĀĂĄäåāăąǍÆǼǺ@ǎæǽǻªΑΆАЯẠαάаяạẢẤẦẨẪảấầẩẫẬẮẰẲẴậắằẳẵẶặ" -"", "BΒБВЪЬbβбвъьßẞЫы", -"", "CÇĆĈĊcçćĉċČĆĈĊČčćĉċčСΓсγ©¢ℂ℅Ⓒℂ" -"", "DÐĎĐΔДdðďđδдЂђ₫" -"", "EÈÉÊËeèéêëĒĔĖĘĚěēĕėęЀЁЄЄЭѐёєєэЕΕΈΗΉεέηήеẸẺẼẾỀẹẻẽếềỂỄỆÆ€ểễệæ&Ⓔ" -"", "FΦФfφфϕƒ₣" -"", "GĜĞĠĢgĝğġģΓГЃҐγгѓґℊ" -"", "HĤĦΗΉХhĥħηήхЧШЩчшщℎℏ" -"", "IÌÍÎÏiìíîïĨĪĬĮİĩīĭįıǏIJΙΊΪǐijιίΐΪЇІИЍϊїіиѝЙỈỊйỉị" -"", "JĴIJЈjĵijȷј" -"", "KĶΚΧЌКķkκχќкĸ" -"", "LĹĻĽĿŁlĺļľŀłΛЛЉλљ₤ℓⓁ" -"", "MΜМmµмμ" -"", "NÑŃŅŇŊnñńņňŋΝЊНνΰњнʼnⁿ№" -"", "OÒÓÔÕoòóôõÖŌŎŐƠöōŏőơǑØǾŒΌǒøǿœόΩΏОỌỎωώоọỏỐỒỔỖỘốồổỗộỚỜỞỠỢớờởỡợ°0º℅" -"", "PΠПРΨpπпрψϖ¶₧" -"", "Qqℚ" -"", "RŔŖŘΡРРřrŕŗρрʳℝ" -"", "SŚŜŞŠȘsśŝşšșΣЅСσѕс$§ßẞſ" -"", "TŢŤŦȚtţťŧțΘΤТÞЋθτтþћЦц℡™" -"", "UÙÚÛÜuùúûüŨŪŬŮŰũūŭůűŲƯǓǕǙųưǔǖǘǛΫΎЎУǜϋύўуỤỦỨỪỬụủứừửỮỰЮữựю" -"", "VВvв" -"", "WŴẀẂẄΩwŵẁẃẅω" -"", "XΞΧХxξχх" -"", "YÝŶŸΥyýÿŷυΎỲỴỶỸύỳỵỷỹΫЫЮЯ¥ϋыюя" -"", "ZŹŻŽΖЏzźżžζџЖЗжз" -"", "0₀⁰°º" -"", "1₁¹¼½" -"", "2₂²½" -"", "3₃³¾" -"", "4₄⁴¼¾" -"", "5₅⁵" -"", "6₆⁶" -"", "7₇⁷" -"", "8₈⁸" -"", "9₉⁹" -"", "‽?¿¡ˀ,.·;!‼" -"", "^⁳ˆˇˉ˘˙˚˛˜˝̣ʹ͵" -"", "-‐–—―−_‗‾" -"", "'""′″`´‘’‚‛“”„" -"", "|†‡" -"", "*×·•" -"", "/÷⁄" -"", ".…" -"", "%‰½¼¾℅" -"", "<‹«>»›" -"", "$€¢£¤¥₣₤₧₫₭₹₺₽ƒ" - -"RPL", "→⇄Σ∏∆≤≠≥∂∫ⒸⒺⓁ|?ⅈ∡·×÷_⁳°′″«»{}↑Ⓓⓧ" -"Arith", "+-*/×÷<=>≤≠≥·%^↑\±" -"Math", "Σ∏∆∂∫πℼ′″°ⅈⅉℂℚℝ+-±^↑*×·∙∡/÷%‰⁳⁰¹²³⁴⁵⁶⁷⁸⁹½¼¾ø∞₀₁₂₃₄₅₆₇₈₉⅛⅜⅝⅞|≤≠≈≡≥√∛∜ℎℏ⌐¬⌠⌡−∩∟∠∡⊿" "French", "àéèêôùÀÉÈÊÔÙëîïûü§" -"Punct", ".,;:!?#$%&'""¡¿`´~\" -"Delim", "()[]{}«»'""¦§¨­¯" - -"Arrows", "←↑→↓↔↕⇄⇆↨⌂▲▼◀▬▶◢◣◄▪►◥◤◀■▶" -"Blocks", "┌┬┐─├┼┤│└┴┘▬╒╤╕▄╞╪╡█╘╧╛▀╓╥╖▌╟╫╢▐╙╨╜▪╔╦╗═╠╬╣║╚╩╝■ ░▒▓□▫" - - -"Bullets", "·∙►▶→■□▪▫▬○●◊◘◙" -"Money", "$€¢£¤¥₣₤₧₫₭₹₺₽ƒ", -"Greek", "αβγδεΑΒΓΔΕάΆ·ΈέζηθικΖΗΘΙΚΉήϊίΊλμνξοΛΜΝΞΟʹ͵΅ΌόπρστυΠΡΣΤΥ ϋςΎύφχψωΰΦΧΨΩ΄ϕ;ϖώΏ" -"Europe", "ÀÁÂÃÄàáâãäÅÆÇåæçÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞßèéêëìíîïðñòóôõöøùúûüýþÿĀāĂ㥹ĆćĈĉĊċČčĎďĐđĒēĔĕĖėĘęĚěĜĝĞğĠġĢģĤĥĦħĨĩĪīĬĭĮįİıIJijĴĵĶķĸĹĺĻļĽľĿŀŁłŃńŅņŇňʼnŊŋŌōŎŏŐőŒœŔŕŖŗŘřŚśŜŝŞşŠšŢţŤťŦŧŨũŪūŬŭŮůŰűŲųŴŵŶŷŸŹźŻżŽžſƒƠơƯưǍǎǏǐǑǒǓǔǕǖǗǘǙǚǛǜǺǻǼǽǾǿȘșȚțȷ" -"Cyrillic", "АБВГДабвгд ЕЖЗИЙежзий КЛМНОклмно ПРСТУпрсту ФХЦЧШфхцчш ЩЪЫЬЭщъыьэ ЮЯ юя " - -"Picto", "⌂№℡™⚙☺☻☼♀♂♠♣♥♦◊♪♫○●▬▪▫░▒▓▀▄█▌▐■□" -"Music", "♩♪♫♭♮♯" -"XNums", "⁰¹²³⁴₀₁₂₃₄ⅠⅡⅢⅣⅤ⁵⁶⁷⁸⁹₅₆₇₈₉ⅥⅦⅧⅨⅩⅪⅫⅬⅭⅮⅯ⅛⅜⅝⅞⁳№⁻" -"XLttr", "$&@¢©¥ℂ℅ℊℎℏℓ№ℚℝ℡™Å℮ℼⅈⅉⅠⅡⅢⅣⅤⅥⅦⅧⅨⅩⅪⅫⅬⅭⅮⅯ" - -"All", " !""#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ⒸⒹⒺⓁⓅⓧÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿĀāĂ㥹ĆćĈĉĊċČčĎďĐđĒēĔĕĖėĘęĚěĜĝĞğĠġĢģĤĥĦħĨĩĪīĬĭĮįİıIJijĴĵĶķĸĹĺĻļĽľĿŀŁłŃńŅņŇňʼnŊŋŌōŎŏŐőŒœŔŕŖŗŘřŚśŜŝŞşŠšŢţŤťŦŧŨũŪūŬŭŮůŰűŲųŴŵŶŷŸŹźŻżŽžſƒƠơƯưǍǎǏǐǑǒǓǔǕǖǗǘǙǚǛǜǺǻǼǽǾǿȘșȚțȷʳˀˆˇˉ˘˙˚˛˜˝̣ʹ͵;΄Ά·ΈΉΊΌΎΏΐΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤΥΦΧΨΩΪΫάέήίΰαβγδεζηθικλμνξοπρςστυφχψωϊϋόύώϕϖЀЁЂЃЄЅІЇЈЉЊЋЌЍЎЏАБВГДЕЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯабвгдежзийклмнопрстуфхцчшщъыьэюяѐёђѓєѕіїјљњћќѝўџҐґẀẁẂẃẄẅẞẠạẢảẤấẦầẨẩẪẫẬậẮắẰằẲẳẴẵẶặẸẹẺẻẼẽẾếỀềỂểỄễỆệỈỉỊịỌọỎỏỐốỒồỔổỖỗỘộỚớỜờỞởỠỡỢợỤụỦủỨứỪừỬửỮữỰựỲỳỴỵỶỷỸỹ      ‐–—―‗‘’‚‛“”„†‡•…‰′″‹›‼‽‾⁄ ⁰⁳⁴⁵⁶⁷⁸⁹⁻ⁿ₀₁₂₃₄₅₆₇₈₉₣₤₧₫€₭₹₺₽ℂ℅ℊℎℏℓ№ℚℝ℡™ΩÅ℮ℼⅈⅉ⅛⅜⅝⅞ⅠⅡⅢⅣⅤⅥⅦⅧⅨⅩⅪⅫⅬⅭⅮⅯ←↑→↓↔↕↨⇄⇆∂∆∏∑−∕∙√∛∜∞∟∠∡∩∫≈≠≡≤≥⊿⌂⌐⌠⌡─│┌┐└┘├┤┬┴┼═║╒╓╔╕╖╗╘╙╚╛╜╝╞╟╠╡╢╣╤╥╦╧╨╩╪╫╬▀▄█▌▐░▒▓■□▪▫▬▲▶►▼◀◄◊○●◘◙◢◣◤◥◦☺☻☼♀♂♠♣♥♦♪♫⚙" diff --git a/config/constants.csv b/config/constants.csv index 2ee6d1fc..f0217ab6 100644 --- a/config/constants.csv +++ b/config/constants.csv @@ -1,69 +1,5 @@ -"Math" - -"π", "3.14159" -"e", "2.71828" -"ⅈ", "0+ⅈ1" -"ⅉ", "0+ⅈ1" -"∞", "9.99999E999999" -"?", "Undefined" - -"Chem" - -"NA", "6.0221367E23_mol⁻¹" -"k", "1.380658E-23_J/K" -"Vm", "22.4141_mol⁻¹" -"R", "8.31451_J/(mol*K)" -"StdT", "273.15_K" -"StdP", "101.325_kPa" -"σ", "5.67051E-8_W/(m^2*K^4)" - -"Phys" - -"ⅉ", "0+ⅈ1" -"c", "299792458_m/s" -"ε0", "8.85418781761E-12_F/m" -"μ0", "1.25663706144E-6_H/m" -"g", "9.80665_m/s^2" -"G", "6.67259E-11_m^3/(s^2*kg)" -"h", "6.6260755E-34_J*s" -"ℏ", "1.05457266E-34_J*s" -"qe", "1.602176634E-19_C" -"me", "9.1093837139E-31_kg" -"qme", "175881962000_C/kg" -"mp", "1.6726231E-27_kg" -"mpme", "1836.152701" -"α", "0.00729735308" -"ø", "2.06783461E-15_Wb" -"F", "96485.309_C/mol" -"R∞", "10973731.534_m⁻¹" -"a0", "0.0529177249_nm" -"μB", "9.2740154E-24_J/T" -"μN", "5.0507837393E-27_J/T" -"λ0", "1239.8425_nm" -"f0", "2.4179883E14_Hz" -"λc", "0.00242631058_nm" -"rad", "1_r" -"twoπ", "π_2*r" -"angl", "180_°" -"c3", "0.002897756_m*K" -"kq", "0.00008617386_J/(K*C)" -"ε0q", "55263469.6_F/(m*C)" -"qε0", "1.4185978E-30_F*C/ m" -"εsi", "11.9" -"εox", "3.9" -"I0", "0.000000000001_W/m^2" - "Dates" "BastilleDay", "17890714_date" "MartinLutherKingDeath", "19680404_date" "IndependenceDay", "17760704_date" - -"Comp" - -"No", "False" -"Yes", "True" -"UnixEpoch", "19700101_date" -"SinclairZX81RAM", "1_KiB" -"PageSize", "4_KiB" -"HelloWorld", """Hello World""" diff --git a/config/units.csv b/config/units.csv index 3b48c20f..6c0c3669 100644 --- a/config/units.csv +++ b/config/units.csv @@ -17,339 +17,6 @@ "CHF", "1.11_USD" -"Length" - -"m", "1_m" -"yd", "9144/10000_m" -"ft", "3048/10000_m" -"ftUS", "1200/3937_m" -"US", "1_ftUS/ft" - -"cm", "=" -"mm", "=" -"in", "254/10000_m" -"mil", "254/10000000_m" -"μ", "1_μm" - -"km", "=" -"mi", "5280_ft" -"nmi", "1852_m" -"miUS", "1_mi*US" -"fur", "660_ft" - -"ch", "66_ft" -"rd", "1/4_ch" -"cable", "720_ft" -"fath", "6_ft" -"league", "3_mi" - -"Mpc", "=" -"pc", "30856775814913673_m" -"au", "149597870700_m" -"lyr", "31557600_ls" -"ls", "299792458_m" - -"mi", "=" -"miUS", "=" -"ft", "=" -"ftUS", "=" -"US", "=" - -"nmi", "=" -"cable", "=" -"li", "1/100_ch" -"acable", "18532/100_m" -"icable", "1852/10_m" - -"Å", "100_pm" -"fermi", "1_fm" -"μm", "=" -"nm", "=" - -"chain", "1_ch" -"fathom", "1_fath" -"furlong", "1_fur" -"link", "1_li" -"rod", "1_rd" -"pole", "1_rd" -"perch", "1_rd" - - -"Area" - -"m²", "=" -"yd²", "=" -"ft²", "=" -"in²", "=" -"cm²", "=" - -"km²", "=" -"mi²", "=" -"ha", "=" -"a", "100_m²" -"acre", "1_ac" - -"ac", "10_ch²" -"acUS", "10_ch²*US²" -"mi²", "=" -"miUS²", "=" -"US²", "=" - -"b", "100_fermi²" -"barn", "1_b" -"mm²", "=" -"μm²", "=" -"nm²", "=" - - -"Volume" - -"m³", "=" -"l", "1_dm³" -"gal", "231_in³" -"cm³", "=" -"mm³", "=" - -"gal", "=" -"qt", "1/4_gal" -"pt", "1/8_gal" -"cup", "1/16_gal" -"floz", "1/32_qt" - -"m³", "=" -"yd³", "=" -"ft³", "=" -"in³", "=" -"cm³", "=" - -"gill", "1/32_gal" -"drqt", "67200625/1000000_in³" -"drgal", "4_drqt" -"bu", "32_drqt" -"pk", "8_drqt" - -"galC", "4546090_mm³" -"galUK", "4546092_mm³" -"ptUK", "1/2_galUK" -"ozUK", "1/40_galUK" -"fbm", "1_ft²*in" - -"tbsp", "4_oz" -"tsp", "1/3_tbsp" -"st", "1_m³" -"bbl", "7056_in³" -"crbl", "5826_in³" - - -"Time" - -"s", "1_s" -"min", "60_s" -"h", "3600_s" -"d", "86400_s" -"yr", "36524219/100000_d" - -"Hz", "1_s⁻¹" -"kHz", "=" -"MHz", "=" -"GHz", "=" -"rpm", "1/60_Hz" - -"year", "1_y" -"day", "1_d" -"hour", "1_h" -"minute", "1_min" -"second", "1_s" - - -"Speed" - -"m/s", "=" -"km/h", "=" -"ft/s", "=" -"mph", "1_mi/h" -"knot", "1_nmi/h" - -"c", "299792458_m/s" -"ga", "980665/100000_m/s^2" -"G", "1_ga" -"kph", "1_km/h" - - -"Mass" - -"kg", "=" -"g", "1_g" -"t", "1000_kg" -"ct", "200_mg" -"mol", "1_mol" - -"lb", "45359237/100000_g" -"oz", "1/16_lb" -"dr", "1/256_lb" -"stone", "14_lb" -"grain", "1/7000_lb" - -"qrUK", "28_lb" -"qrUS", "25_lb" -"cwtUK", "112_lb" -"cwtUS", "100_lb" -"gr", "1_grain" - -"tonUK", "20_cwtUK" -"tonUS", "20_cwtUS" -"ton", "1_tonUS" -"slug", "1_lbf*s^2/ft" -"blob", "12_slug" - -"dwt", "24_grain" -"ozt", "20_dwt" -"lbt", "12_ozt" -"dram", "1_dr" -"drachm", "1_dr" - -"mole", "1_mol" -"carat", "1_ct" -"u", "1.6605402E-27_kg" -"Avogadro", "6.02214076E23" - - -"Force" - -"N", "1_kg*m/s^2" -"dyn", "1/100000_N" -"kip", "1000_lbf" -"lbf", "44482216152605/10000000000000_N" -"gf", "980665/100000000_N" - -"pdl", "138254954376/1000000000000_N" - - -"Energy" - -"J", "1_kg*m^2/s^2" -"erg", "1/10000000_J" -"Kcal", "=" -"cal", "41868/10000_J" -"Btu", "1055.05585262_J" - -"calth", "4184/1000_J" -"cal4", "4204/1000_J" -"cal15", "41855/10000_J" -"cal20", "4182/1000_J" -"calmean", "4190/1000_J" - -"therm", "105506000_J" -"eV", "1.60217733E-19_J" - - -"Power" - -"W", "1_J/s" -"kW", "=" -"MW", "=" -"GW", "=" -"hp", "745.699871582_W" - - -"Envir" - -"K", "1_K" -"°C", "1_K" -"°R", "9/5_K" -"°F", "9/5_K" -"mbar", "=" - -"Pa", "1_N/m^2" -"atm", "101325_Pa" -"bar", "100000_Pa" -"psi", "6894.75729317_Pa" -"torr", "1/760_atm" - -"ksi", "1000_psi" -"mmHg", "1_torr" -"inHg", "1_in/mm*mmHg" -"inH2O", "249.0889_Pa" - - -"Elec" - -"A", "1_A" -"V", "1_kg*m^2/(A*s^3)" -"C", "1_A*s" -"Ω", "1_V/A" -"F", "1_C/V" - -"Fdy", "96487_A*s" -"H", "1_ohm*s" -"S", "1_A/V" -"T", "1_V*s/m^2" -"Wb", "1_V*s" - -"mho", "1_S" -"ohm", "1_Ω" - - -"Angle" - -"turn", "1_turn" -"°", "1/360_turn" -"grad", "1/400_turn" -"r", "0.1591549430918953357688837633725144_turn" -"πr", "1/2_turn" - -"dms", "1_°" -"arcmin", "1/60_°" -"arcs", "1/60_arcmin" -"sr", "1_sr" -"pir", "1/2_turn" - - -"Lt/Rad" - -"cd", "1_cd" -"lm", "1_cd*sr" -"lx", "1_lm/m^2" -"fc", "1_lm/ft^2" -"flam", "1_cd/ft^2*r/pir" - -"ph", "10000_lx" -"sb", "10000_cd/m^2" -"lam", "1_cd/cm^2*r/pir" -"nit", "1_cd/m^2" -"nt", "1_cd/m^2" - -"Gy", "1_m^2/s^2" -"rad", "1/100_m^2/s^2" -"rem", "1_rad" -"Sv", "1_Gy" -"Bq", "1_Hz" - -"Ci", "37_GBq" -"R", "258_µC/kg" - - -"Visc" - -"P", "1/10_Pa*s" -"St", "1_cm^2/s" - - -"Comp" - -"bit", "1_bit" -"byte", "8_bit" -"B", "1_byte" -"bps", "1_bit/s" -"baud", "1_bps/SR" - -"Bd", "1_baud" -"mips", "1_mips" -"flops", "1_flops" -"SR", "1" -"dB", "1_dB" - - "=Cycle" "in", "mm" "mm", "cm" diff --git a/images/char-menu.png b/images/char-menu.png index 145b1a220ae0313137ef733e74651bf098422319..c2d94ac3b21f7a505df56af445d611160c4c3024 100644 GIT binary patch delta 2407 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 Z{sZGfdwo0KI$;0+002ovPDHLkV1nD|tt^e4s)L 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≤≠≥·%^↑\\±\""); step("Math menu") .test(CLEAR, RSHIFT, KEY2).noerror() - .test(F3, RSHIFT, ENTER) + .test(F4, RSHIFT, ENTER) .test(NOSHIFT, F1, F2, F3, F4, F5, LSHIFT, F1, LSHIFT, F2, LSHIFT, F3, LSHIFT, F4, LSHIFT, F5, @@ -7384,7 +7385,7 @@ void tests::character_menu() .expect("\"Σ∏∆∂∫πℼ′″°ⅈⅉℂℚℝ\""); step("French menu") .test(CLEAR, RSHIFT, KEY2).noerror() - .test(F4, RSHIFT, ENTER) + .test(F1, RSHIFT, ENTER) .test(NOSHIFT, F1, F2, F3, F4, F5, LSHIFT, F1, LSHIFT, F2, LSHIFT, F3, LSHIFT, F4, LSHIFT, F5, @@ -7414,7 +7415,7 @@ void tests::character_menu() step("Arrows menu") .test(CLEAR, RSHIFT, KEY2).noerror() - .test(LSHIFT, F1, RSHIFT, ENTER) + .test(LSHIFT, F2, RSHIFT, ENTER) .test(NOSHIFT, F1, F2, F3, F4, F5, LSHIFT, F1, LSHIFT, F2, LSHIFT, F3, LSHIFT, F4, LSHIFT, F5, @@ -7424,7 +7425,7 @@ void tests::character_menu() .expect("\"←↑→↓↔↕⇄⇆↨⌂▲▼◀▬▶\""); step("Blocks menu") .test(CLEAR, RSHIFT, KEY2).noerror() - .test(LSHIFT, F2, RSHIFT, ENTER) + .test(LSHIFT, F3, RSHIFT, ENTER) .test(NOSHIFT, F1, F2, F3, F4, F5, LSHIFT, F1, LSHIFT, F2, LSHIFT, F3, LSHIFT, F4, LSHIFT, F5, @@ -7434,7 +7435,7 @@ void tests::character_menu() .expect("\"┌┬┐─├┼┤│└┴┘▬╒╤╕\""); step("Bullets menu") .test(CLEAR, RSHIFT, KEY2).noerror() - .test(LSHIFT, F3, RSHIFT, ENTER) + .test(LSHIFT, F4, RSHIFT, ENTER) .test(NOSHIFT, F1, F2, F3, F4, F5, LSHIFT, F1, LSHIFT, F2, LSHIFT, F3, LSHIFT, F4, LSHIFT, F5, LSHIFT, F6, @@ -7443,7 +7444,7 @@ void tests::character_menu() .expect("\"·∙►▶→□▪▫▬○●◊◘◙\""); step("Currency menu") .test(CLEAR, RSHIFT, KEY2).noerror() - .test(LSHIFT, F4, RSHIFT, ENTER) + .test(LSHIFT, F5, RSHIFT, ENTER) .test(NOSHIFT, F1, F2, F3, F4, F5, LSHIFT, F1, LSHIFT, F2, LSHIFT, F3, LSHIFT, F4, LSHIFT, F5, LSHIFT, F6, @@ -7452,7 +7453,7 @@ void tests::character_menu() .expect("\"$€¢£¤₣₤₧₫₭₹₺₽ƒ\""); step("Greek menu") .test(CLEAR, RSHIFT, KEY2).noerror() - .test(LSHIFT, F5, RSHIFT, ENTER) + .test(LSHIFT, F1, RSHIFT, ENTER) .test(NOSHIFT, F1, F2, F3, F4, F5, LSHIFT, F1, LSHIFT, F2, LSHIFT, F3, LSHIFT, F4, LSHIFT, F5, @@ -7926,7 +7927,7 @@ void tests::regression_checks() test(CLEAR, "8 gamma", ENTER).expect("5 040."); step("Bug 168: pi no longer parses correctly"); - test(CLEAR, SHIFT, I, F1, F1).expect("π"); + test(CLEAR, LSHIFT, I, F2, F1).expect("π"); test(DOWN).editor("Ⓒπ"); test(ENTER).expect("π"); @@ -9161,9 +9162,9 @@ tests &tests::itest(cstring txt) // Special characters that require the characters menu #define NEXT k = RESERVED2; break - case L'ℂ': itest(RSHIFT, KEY2, F3, RSHIFT, F3); NEXT; - case L'ℚ': itest(RSHIFT, KEY2, F3, RSHIFT, F4); NEXT; - case L'ℝ': itest(RSHIFT, KEY2, F3, RSHIFT, F5); NEXT; + case L'ℂ': itest(RSHIFT, KEY2, F4, RSHIFT, F3); NEXT; + case L'ℚ': itest(RSHIFT, KEY2, F4, RSHIFT, F4); NEXT; + case L'ℝ': itest(RSHIFT, KEY2, F4, RSHIFT, F5); NEXT; case L'⁻': itest(RSHIFT, KEY2, RSHIFT, F4, F6, F6, RSHIFT, F3); NEXT; case L'⁰': itest(RSHIFT, KEY2, RSHIFT, F4, F1); NEXT; case L'¹': itest(RSHIFT, KEY2, RSHIFT, F4, F2); NEXT; @@ -9185,13 +9186,13 @@ tests &tests::itest(cstring txt) case L'₇': itest(RSHIFT, KEY2, RSHIFT, F4, F6, LSHIFT, F3); NEXT; case L'₈': itest(RSHIFT, KEY2, RSHIFT, F4, F6, LSHIFT, F4); NEXT; case L'₉': itest(RSHIFT, KEY2, RSHIFT, F4, F6, LSHIFT, F5); NEXT; - case L'∛': itest(RSHIFT, KEY2, F3, F6, F6, F6, F6, LSHIFT, F2); NEXT; - case L'∜': itest(RSHIFT, KEY2, F3, F6, F6, F6, F6, LSHIFT, F3); NEXT; - case L'⊿': itest(RSHIFT, KEY2, F3, F6, F6, F6, F6, F6, F5); NEXT; - case L'∠': itest(RSHIFT, KEY2, F3, F6, F6, F6, F6, F6, F3); NEXT; - case L'Ⓓ': itest(RSHIFT, KEY2, F1, F6, F6, F1); NEXT; - case L'ⓧ': itest(RSHIFT, KEY2, F1, F6, F6, F2); NEXT; - case L'°': itest(RSHIFT, KEY2, F1, F6, SHIFT, F3); NEXT; + case L'∛': itest(RSHIFT, KEY2, F4, F6, F6, F6, F6, LSHIFT, F2); NEXT; + case L'∜': itest(RSHIFT, KEY2, F4, F6, F6, F6, F6, LSHIFT, F3); NEXT; + case L'⊿': itest(RSHIFT, KEY2, F4, F6, F6, F6, F6, F6, F5); NEXT; + case L'∠': itest(RSHIFT, KEY2, F4, F6, F6, F6, F6, F6, F3); NEXT; + case L'Ⓓ': itest(RSHIFT, KEY2, F2, F6, F6, F1); NEXT; + case L'ⓧ': itest(RSHIFT, KEY2, F2, F6, F6, F2); NEXT; + case L'°': itest(RSHIFT, KEY2, F2, F6, SHIFT, F3); NEXT; #undef NEXT } diff --git a/src/unit.cc b/src/unit.cc index 07869ebb..264a7791 100644 --- a/src/unit.cc +++ b/src/unit.cc @@ -571,9 +571,9 @@ static const cstring basic_units[] = "hp", "745.699871582_W", // Horsepower // ------------------------------------------------------------------------ - // PRESSURE MENU + // ENVIRONMENT MENU // ------------------------------------------------------------------------ - "Press", nullptr, + "Envir", nullptr, "Pa", "1_N/m^2", // Pascal "atm", "101325_Pa", // Atmosphere @@ -586,11 +586,6 @@ static const cstring basic_units[] = "inHg", "1_in/mm*mmHg", // inch of mercury "inH2O", "249.0889_Pa", // Inch of H2O - // ------------------------------------------------------------------------ - // TEMPERATURE MENU - // ------------------------------------------------------------------------ - "Temp", nullptr, - "K", "1_K", // Kelvin "°C", "1_K", // Celsius "°R", "9/5_K", // Rankin @@ -634,9 +629,9 @@ static const cstring basic_units[] = "pir", "1/2_turn", // Pi radians // ------------------------------------------------------------------------ - // LIGHT MENU + // LIGHT/Radiation MENU // ------------------------------------------------------------------------ - "Light", nullptr, + "Lt/Rad", nullptr, "cd", "1_cd", // Candela "lm", "1_cd*sr", // Lumen @@ -650,11 +645,6 @@ static const cstring basic_units[] = "nit", "1_cd/m^2", // Nit "nt", "1_cd/m^2", // Nit - // ------------------------------------------------------------------------ - // RADIATION MENU - // ------------------------------------------------------------------------ - "Rad", nullptr, - "Gy", "1_m^2/s^2", // Gray "rad", "1/100_m^2/s^2", // rad "rem", "1_rad", // rem