From b0e14989eee8c01a828382ef5327af01a254c465 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Thu, 12 Feb 2009 16:52:44 -0600 Subject: [PATCH] Redo word icons for better layout in UI --- .../icons/class-predicate-word.tiff | Bin 1374 -> 1374 bytes basis/definitions/icons/class-word.tiff | Bin 1364 -> 1364 bytes basis/definitions/icons/constant-word.tiff | Bin 1368 -> 1368 bytes basis/definitions/icons/generic-word.tiff | Bin 1366 -> 1366 bytes basis/definitions/icons/macro-word.tiff | Bin 1364 -> 1364 bytes basis/definitions/icons/normal-word.tiff | Bin 1366 -> 1366 bytes basis/definitions/icons/parsing-word.tiff | Bin 1366 -> 1366 bytes basis/definitions/icons/primitive-word.tiff | Bin 1368 -> 1368 bytes basis/definitions/icons/symbol-word.tiff | Bin 1366 -> 1366 bytes basis/tools/vocabs/browser/browser.factor | 12 ++++++------ 10 files changed, 6 insertions(+), 6 deletions(-) diff --git a/basis/definitions/icons/class-predicate-word.tiff b/basis/definitions/icons/class-predicate-word.tiff index 153dee5454e992feeedcaf3f732c2bb351d8a0fa..2a5aeafa85c29731e0d9a648e095a1906b5cfe27 100644 GIT binary patch literal 1374 zcmds%&1=(e7{{OV#a6*FyEm8==au zM9lnOF;BlwaQ9r)#AIYHs>~e^W;O5?e)Y1meH3015f@My*GeFFVQOl z=pmWUg(~K=P=(LBIk%!O0S2D@MS5<4PvG7GyhV?JCqG3`wg7j*cX)j6JGnJYj{~5$ z3xaOuFtv|J@RLA9y+G*DK4|=Yh-_{ literal 1374 zcmd6n-%C?r9LAsHHk+g1WTj%O9dYQ`*x6R*WF;)@q6G&1m;|MqHMccgsoSZ6d9l0* z@+OOj?4s6{-gHy{NT3ju!3lQ}x{JtNY5Mj(;|vZvDBaZ=&)(;K_xZf<%eh!2;)c}> zFvk9i4C140088@&SS;?B3s`y+#-dPv@AD{*gi&Oa*0=UpJGjVmKfzM<_&%y z=A+@h&h9Q2D4HRX2~z`ZJBbpV``nb zAN*h^CN_3kGiBDA*;qw^nTb()@W|l%F)al!UG@27seCf?ops(*SaYhh%_mAbd~)rD zdOk4<#o&99l_=y-@=e2E%huslM%kq-9vJ!7ReJ{_vI=nq--9v9jq$3F=*oKxt$e_> zWwGYfMq(6-!FS=d)QvcEA<^Z5)V5cMS)&+yCvIJK;wJmcJg(hGKXxK|u@l#C?3WG< z4S5i4)O-K39|1TMH~>6_)Aa`G^ap`o^kvf4RjyI%4b*MA^+Q|(+G%Zz_`{sJx~G-q z%{u0o*42Gmv|gazs`2W9?VP3R9<>0+wQi?w*X`rdx{2HXog1RjNzA3%J~Y3oG3q_l z$EtnenOH98oy;ai)A5*`@a8A7qoSNnCK0xMb`!|e#>m}RDlr&KrQ_p5uh=8{1%J>N fIOX&A30DHW!W~(j4EcQdd|pheB!x(EBAdb=vWH^0 diff --git a/basis/definitions/icons/class-word.tiff b/basis/definitions/icons/class-word.tiff index 48615938f579e31b8b7a99e6a95609d6d63f17b8..4d561525c9a09aadd5b195eb842687bd4278882c 100644 GIT binary patch delta 310 zcmaLN&k6xy6o=s-QDQR-b`}=1asd=FLPnG+e{VxcedP*Rnaq|gTV~-~n6gl8r)Hr> zuE8B}oaGdYw{y5c{ejnbpT%*!I!@p;xRFmwAzPz?7@9?;huw$KdCqU#SGkJ z2iLQyB)_{baAj}fBwKLUX^J)+b{%`!z=6F1Tj)5j*RYdSY}xDB3A)+K*hq@Kg0;}F t`MO$yC5x~g)HqlHmQBWgIn1YdEZ%=|Oyy$7BH>U1GcOAuM01sjY9G*0bRz%& literal 1364 zcmds1J4?e*7(HoKLP5}q3hEH4L$x)z@zIvzBUA?~I4D*JA5i+Ts5IC@)Jae$6-P(u zCjCSH4@VuY-z~RLB-bC%gp+&noyScwB%7Us-Uo2bdkPz9?Pu`e`e75Tat^Ja>YX!a zCLA>Re^^KJQk7r9n?vBMc%zN zLR-XxGS6`BFx+s4Ti?9UY}_dGakx$#H6DZOn-|(VYRY^RMJI|9pGEO7h7$V=p+!+v z<|8jZhWJ3Vy2Cq3dh#i7fyaFMUq=e^oh(QH)9WjLYFIg+)`n!U_dN;~;V owQz1E%q5c>B$F8VsJYw>?H+&57`MP_>QoIW7_GofPIe;A%pH}gMG z>>W^Ep}%U%k-qXN|GM%g{)ge7;z|GetEc>*)G$eAqJWG_Lqh{oM@jFu&Z2&}8nD`e z3IBoOK-}jGR+rPJ(U8;nzdf%PRUOc5p!na0?6x|Px~i1gn99_;{~dW~<^k2!q&NMk zOs!oHQdbaL)?XM~_OCv@^*=f;ORWB17+d}Xq%I>YHz_kT?>{b_6`HqwqQH^O94u^% T+zi!Mv=|r|7=iR;NmhFRk2J0t delta 368 zcmcb?b%Sez45Q5a?j;5DdzS7%#tVCv&0RHh70*Ng1%*Z3i@0aD&igmLY0m$t4YR>` z8juEx{h!$~KNO^9QtdR`iM7-I_Y_b1-<3ZRjwjYk`va6~1*z#S?=R{q>xaw1)OD9k z_|sX|zYV0OIlp~bbAHEfm>i65&FlW(l;8dms79qaz2SaCRvU&nEjiu)fpY&V6Wc^5 z3P@;FL{$hD$5;HXO>6$&meYfRn=(88gXBu$DqKKnv!jaTbHWRMW``I2$Axpk^4%v2 s$S7n6XX>Q~W_e)4X`xv*69q18=3rrCzzC!#OS0Mn0FDv4x&QzG diff --git a/basis/definitions/icons/generic-word.tiff b/basis/definitions/icons/generic-word.tiff index c00491fd36f6013db2427f8d7d9d5b324b090677..155afd915cfa2a4ffb73a9d9fd829888efc38b0e 100644 GIT binary patch delta 398 zcmXw#-77(tl_Z!gjXdoYTm=Tq{@p z70HdfB;{(eU8tS&{Jze)aPjG>=lk^i)bnI{vdGU0-|v{dLaqM>Q{#8Y2f$5SqHXE| zvhNyJ#U==2XA~JdW6=2+J;z+PL<>IUm%LK$wdYU`x1J+Uu{neRnZ!Yb$d^=UKwOc9$KO=G)?NL>8?K8L{I5wP(VG^BTO`T1C!eCPQf+w0q(>9~VZT8c!g&D)ihe)j7 z)YM7o9UXgV)P)$;g$ONs?4>=9X2WS;A<-TrR=KKCd64C**VuhuEb}`orC7@@%Xq>t z8(r2#td|5B6$fx#w1k?9Ww>kCa%p}&cUu)isoqt=1yEp_N2T#k1CE2qI&Wn1L!sGh RD&{sH8}zM7pGkY3`wwLy*&_e| delta 411 zcmXw#+baZN7{+Ji)Hv)A8OOw6bIJu}3%j|Ibw~~y;Yx8qE@+*W?3TqS*_j>3z3@l4 z@n5(@l;Xl6t&I%X{pNejr(FDcdY|`q@%CQwmwfPA90?=O=R*Pjjxl};*W@vHMUbRX z6`Ag1`aN_+Z`>ysVEazhcltOnXAh z){ov8AcxFz?m%qcrRdjm4DNrTV~-Fvx5&maj=-4t;zJ7wDD$7vvO9A<5c540)vG!R7YtJ1p|Pqp66sgo&?d(sc9~2t zFJm4#)>#S@Vx2X@*>fna^#0s7tn2rcE3t6N60#JbR7{?RJ7o$L|36NjAp`sj3KZe` WEHyFFlIG;EsyU9cm>J4Ta{K}g{o%a; diff --git a/basis/definitions/icons/macro-word.tiff b/basis/definitions/icons/macro-word.tiff index 9506d0dff231f967783fc2241115601046254c69..3b7b7a73b13b4412dfb95e546c51c4ea5c2451dc 100644 GIT binary patch delta 319 zcmcb@b%krfm5B;GEU!0il$t1DA@E|w3Z3VxR{aO!L(f;Pbet$)An|P3GLa_>7ybw0 zA7FaXqWzB+EU=p>pd<5m`t%2nrca;tXvU1lhtsFu0J8rB#r6Q%))NI(RPOintp(zf z|NsAI_`hlu^S$2Q7$E-^5dR0_o%j3u4JHc6sN8L7>Alm^@&c?5q!x(pHaDvR#qI;~ ze;{55Qg^GmdM6O?0mmsNpJk$efyA>#i-MjmUi=?~pDkW|=gE>K@&8w? zVxB0Vp>S``9QjAHX8nIObLNzXvu5oBvuDk^^?3H|nEwq8OcMoER31#2@EVBw{{R2a z@L=LZM-YQnBO&T!RPJ_k?7Q3Ez7wPlhVQnu`2fW}1M&Ym?d>fS1!Poi z)z;p=SyM9yq~=Uo8Y_^W2E-46_&*SDyirr5I8i`C;cj_3|BaH8e?VMtv$!|~NIwAL z|JO@Owp=eRHl8S;AaNxt%kgSf)_)-W3Z=JS&B!nV`c2?sQc~Qd#KiwVyz5d@k|i)K pIIf0U)8^d> z{CT869^d>0iWr}`oC7U*J<_A~K5Z0-=*=ODIUIN|>1?$?Gn|R;g$!u!ETAi6$l|vv zOBYKivT?S;>}hB@&hf`+(V3<>&ep6#iY&q@**SZDv6{`MS>dW15Cp+ww7F>6{R05g BsiFV? delta 339 zcmW-c%}N3R9K=^LiEYsp3bzpYGSIRPA-bJh=%j*CDt(aG2r7v%0`0J5*&#!B)s3iL zplh!Z_5c-#Ar&SDvj1uI@MD-^V3-Nn6yEC$sSradVYSjlSk?7VnL1%bzlvzEE4<4k-9QW$2#HDyTiOpIr9T*+3|dkF zXHpfM!aLo83yA(aVO{ycPPNfzquj*GbqBpXkf)~a5?+ND+>0_quS{4gej-`<=o2qB zu$=EuFJF-9&6C5d(REE`Ax>uq(Lx>Z;ye7gU+Vdp3^k^*IGC4VG4`E~V~9eU;K{Zz zmexr)p>H9L({UNB@nghxge7Z=U`tWkn$pkhyRaGmIfjABvX4#f5TgoTe;zWMO~VrV OI>#`K$JE6DI}!1XlN}O8yZwR;Sh%#PC3-!fj5eD2GN}sH#OW8 zgf!OF5ESTndU{2qMneSs2e04LJ8<~$h41(Cc)ZsQc7tb@91eI9nv?0(X@nzYBEhti z$p;{bF{WHv@%RCBuVyM0k!dE{V%a@|WxoO3X4!k!BWa}5m!t>&U^|xSm1u|KGyoeM zS1}Rtk5%<>tSHyRdi})Ibw6x*vYQl#1$u_;z{KzI zyar&C=VRd6uIuElQ7mqd9hmriLC`Egz=K?l_{~`#?t3wFIfm@O)E7mqFN)YM6m~up zWf%OBbLQu((Kxd5`E{~eqB!vfrP2j}0m~{Bwy~~z$vL}LTj(JahW^>vo8-NtYBgXZ zbOm7GY4$(g5V~>t+Yf|jnGS{CCF#^Imp5m<5kkwhBxPi}a<}O7d6uYRXN#gJ59ImU G{Qf^rpBk|M literal 1366 zcmds1OK%cU7`+3n5>gXwZ6(?TE}ED|c^Cst3xx&@k3eJ^NJ(1~@lhlO+fWRNZf4V& zsr?16{R!Rh6UwuNrg2dL7p~QqbYs=)xsw?)0e?Yfa^^eteCK>Kb0?WdWR{pl2%(f- zC{$gp+XrsZ5`fJd(l@|wpJuX;RR0a{yFSl0Rni;FYRego%KulM!fZ02iu zy^}S+p91GViD~`a-MOwP#;70|>Pt(Hpnqqcy3hAeo2^yomU=KqYr$ZJX+25W2dDyB z?wtt282Yl}2?WAgPOG(O)Y1rtDNy+=NzQ*+bw*c~^NmnQW}ap!^xu3l7NbC=yR#D* z%wzqw5s%A?CmJ2jr&5-~M1r;w3GMlhbu-RB?d?sqcwT0nCeIJ$Pmn)KCMoc(lT1eX zf?(=P(&L^emcEGMM4RXDqIb$X?Nn+g&%Q}JoqhxS0{$GWti-gvIb2NldufIQDTYI9{E&`vxz8MKe2)PPyI&J{R4}$!_#i;7c zcS+?2aI;Ro!Wqaow4d-_<3^O3CalMGo=KInxl<|^z;CF2cEg+8sFEEUCFGXMuY*tP z=G;-a5m_hhJC8aIPgI+O^|I<=&&dvxdTwQl+xb_yd*#jIGg~RYu|fRikFzjvT8$L4 xx##h0F8}nU)n$8Nb66d2yYs%?F=yqSF6)a@X=~nYFPF=1q31*a1Br%)SrPU1 zv;NoD&%6twf&3#44KwT}3TP-)RZWSgtepJ6re?BYRn??8pxkR9{tpz}QC&URWTJqA zMqy!hL{U-C|B8w!j?Bz!q>;5MuREFa`gfuNvF@4&!}{{aCR=K=yULE*yF(9po-<&|o{z`y_uy9Jv$SlAf3 Q8LF>nfdqi`WJy+g0ILR`T>t<8 delta 354 zcmcb?b%Sfd6@iY9#c>@SOCAI1qK1a~91{f$BpMrMH#9cR`3J=Rf%tJ_^~4+1Y+Nb0x}wTdF>7P`5iwC3p-Z#TlJxY3LqPl=h%cw5HJJm|sw5;- zH6$cdeqdl=V2p^!FAopT`xq5f^dBg84~S!deqjRIF9Q^7h>R@y78zN%8c6>G;^*Pv z#kpx|X{-|kR78S+`#opeTf)fSKPn4J3 W%)!FO$nC&&T?=FRML67cW3dVwVGS_%H{sI-hBT0n!f21(w-1n-`jia)T!UoT?(*<8lg!IM<=b!umwO8A=P`8)NO-3ieLWdw1FzAp$65YsrUk6C@qFaxgQ}9 zwoaR(ZKEcdFewkhq;kFwD2e}lK`1T+p_CQV5m4xe{a_PrWmB1VuRz@sg5tEP9B15& Rkuli2nF9bK=Fucy`UXi}xh4Pr delta 407 zcmZY4%Sr-q6bA6mFo|h16p@QS7ZMV^fnnm^F|Q@HtVOG!RS)13M8nV~h@zm&lu=4J zSqp_UjBL@xTJ!?-3hJEB*rsyv;QUWhXbKx2)(l=Pvv^r%J9BtGW^4R5B#RDv z8jrRV8c#g+IBr`pR9a~?I_xWjhbdVca{^>a;=Y Brg8uP diff --git a/basis/tools/vocabs/browser/browser.factor b/basis/tools/vocabs/browser/browser.factor index fd5c5cf234..cb2525dd7b 100644 --- a/basis/tools/vocabs/browser/browser.factor +++ b/basis/tools/vocabs/browser/browser.factor @@ -10,7 +10,7 @@ tools.vocabs vocabs vocabs.loader words words.symbol combinators.smart definitions.icons ; IN: tools.vocabs.browser -: <$definition> ( definition -- element ) +: <$pretty-link> ( definition -- element ) [ [ definition-icon 1array \ $image prefix ] [ drop " " ] @@ -19,7 +19,7 @@ IN: tools.vocabs.browser ] output>array ; : vocab-row ( vocab -- row ) - [ <$definition> ] [ vocab-summary ] bi 2array ; + [ <$pretty-link> ] [ vocab-summary ] bi 2array ; : vocab-headings ( -- headings ) { @@ -82,7 +82,7 @@ C: vocab-author [ "Tuple classes" $subheading [ - [ <$definition> ] + [ <$pretty-link> ] [ superclass <$link> ] [ "slots" word-prop [ name>> ] map " " join <$snippet> ] tri 3array @@ -95,7 +95,7 @@ C: vocab-author [ "Predicate classes" $subheading [ - [ <$definition> ] + [ <$pretty-link> ] [ superclass <$link> ] bi 2array ] map @@ -106,7 +106,7 @@ C: vocab-author : (describe-classes) ( classes heading -- ) '[ _ $subheading - [ <$definition> 1array ] map $table + [ <$pretty-link> 1array ] map $table ] unless-empty ; : describe-builtin-classes ( classes -- ) @@ -159,7 +159,7 @@ C: vocab-author ] unless-empty ; : word-row ( word -- element ) - [ <$definition> ] + [ <$pretty-link> ] [ stack-effect dup [ effect>string <$snippet> ] when ] bi 2array ;