From noreply at r-forge.r-project.org Fri Dec 21 16:03:58 2018 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Fri, 21 Dec 2018 16:03:58 +0100 (CET) Subject: [CHNOSZ-commits] r351 - in pkg/CHNOSZ: . R inst inst/extdata/OBIGT man Message-ID: <20181221150358.6475418BB83@r-forge.r-project.org> Author: jedick Date: 2018-12-21 16:03:57 +0100 (Fri, 21 Dec 2018) New Revision: 351 Modified: pkg/CHNOSZ/DESCRIPTION pkg/CHNOSZ/R/util.expression.R pkg/CHNOSZ/inst/NEWS pkg/CHNOSZ/inst/extdata/OBIGT/biotic_aq.csv.xz pkg/CHNOSZ/inst/extdata/OBIGT/organic_aq.csv.xz pkg/CHNOSZ/man/util.expression.Rd Log: organic_aq.csv: adjust names of dicarboxylic acid anions Modified: pkg/CHNOSZ/DESCRIPTION =================================================================== --- pkg/CHNOSZ/DESCRIPTION 2018-11-11 04:55:31 UTC (rev 350) +++ pkg/CHNOSZ/DESCRIPTION 2018-12-21 15:03:57 UTC (rev 351) @@ -1,6 +1,6 @@ -Date: 2018-11-11 +Date: 2018-12-21 Package: CHNOSZ -Version: 1.1.3-58 +Version: 1.1.3-59 Title: Thermodynamic Calculations and Diagrams for Geo(bio)chemistry Authors at R: c( person("Jeffrey", "Dick", , "j3ffdick at gmail.com", role = c("aut", "cre"), Modified: pkg/CHNOSZ/R/util.expression.R =================================================================== --- pkg/CHNOSZ/R/util.expression.R 2018-11-11 04:55:31 UTC (rev 350) +++ pkg/CHNOSZ/R/util.expression.R 2018-12-21 15:03:57 UTC (rev 351) @@ -299,7 +299,7 @@ } # make formatted text for thermodynamic system 20170217 -syslab <- function(system = c("K2O", "Al2O3", "SiO2", "H2O"), dash="\u2013") { +syslab <- function(system = c("K2O", "Al2O3", "SiO2", "H2O"), dash="-") { for(i in seq_along(system)) { expr <- expr.species(system[i]) # use en dash here Modified: pkg/CHNOSZ/inst/NEWS =================================================================== --- pkg/CHNOSZ/inst/NEWS 2018-11-11 04:55:31 UTC (rev 350) +++ pkg/CHNOSZ/inst/NEWS 2018-12-21 15:03:57 UTC (rev 351) @@ -1,4 +1,4 @@ -CHANGES IN CHNOSZ 1.1.3-58 (2018-11-11) +CHANGES IN CHNOSZ 1.1.3-59 (2018-12-21) --------------------------------------- NEW FEATURES @@ -87,6 +87,11 @@ - Change abbreviation of grossular to Grs. +- Make names for dicarboxylic acid anions from Shock, 1995 (in + organic_aq.csv) consistent with those used in later papers, e.g. + H-succinate and succinate-2 for the -1 and -2 charged ions. Remove + duplicated entries for H-succinate and succinate-2 from biotic_aq.csv. + DIAGRAMS - Lines in 1-D diagram()s can optionally be drawn as splines using the Modified: pkg/CHNOSZ/inst/extdata/OBIGT/biotic_aq.csv.xz =================================================================== --- pkg/CHNOSZ/inst/extdata/OBIGT/biotic_aq.csv.xz 2018-11-11 04:55:31 UTC (rev 350) +++ pkg/CHNOSZ/inst/extdata/OBIGT/biotic_aq.csv.xz 2018-12-21 15:03:57 UTC (rev 351) @@ -1,85 +1,104 @@ -?7zXZ???F!t/????5/]7I??b???9??????TB;q?"?q???cL;?"??I?,t?b?PK??7?t(?em?A-P?Q?]?? ??8?.f?|?????V[?????=??K????VTm??~vw? ?2/ ??Wa???s?-?????p?lVs????H???u???? ?%?XF??k#??????????+??(??m5?St5?Fa?a??jN??8????>z???3MwS?%??????+?3x??`cw`?; $? (???????P?>????>?1b???QA??????>6o?=?-?((??pN???i????VOL?A???9 c?E3??XP?? ??kj?s?????Y!&o??w(??3?+?"???????; ??R6eW????![?????r?O>O?*?h\t????ty??)B????n<?9l?N!3???z '???}???nV?,0uVe??????? j?????|B??d^7&KK?- f("?9s??[?S>?W?;!6???2_?????s??3}/????hAa]x^|??j???`????????D3v??zq??F???W??#?U?!??23???1?^Fn??L ??????i??GwrG?u}????1?7?0??s?????:?C??L?????xyd?+?m????i#??;??????+}?j??$?!?1?????Go? ?|?)|?H??a????y??{??o??p????)i??uc??E?ni??8??????? 8H??3?q}??i??s??)???6 ??j???Y?V?-?)??q?^?????,u???#v???8??B?/???6x?7?4??U?~????? y??/mg9??M/?|??Z??????}M X?6????*?o???s???C7jy ?r?N??P*? -????f?d??H??f??T?D;??FN????L??tC?wrKk?????H????I???U???xM??]vj8??m?? h???z??#!?$P!q?????7y?ZO?b9?x??????>?? ??s;??^??H??1r??$?1?6& -???????P???.??82?0?!;???????`???CE?;?c?????Y?t:?C???????)I&^?Gn??l???]A$F???Oz??- )???;?Jn?A|k??L?&V0??9?????@???H??\??j}@?J?o|?q??p?Y??Zs????l?#?^q?0Q?%?RY?????&????2?4-)??={??U?L?n????,?)? -t???%??B??c??????C?B????????d?a~ ?7d??]?`&?]U*ik???)???\??M??????;??yuR???1X^?%5`?$???6c|]/+??yt??"?}?:???;H?3??\???,?Z?U?_??K?k?????????c?r??D?2????rp,???M*h???Z,u???T???>??????$D?a?????'?s?c????z+?-?6J?W???=FX?'k?7=l???S0An9??!?.S???hIXqh?r??J?v{??1??[??+??j[?|??=sa?0? ?y??bD?:???? t?_:R?~????*[???'9????pX????v????!? -?M?C?O?9q?D?g? ?N -%??`???-v -1;?9p?7 ?R?xh.g?|??3?y?/?3$?C,??i??*t~?-C???? 2??=^;t#i???????9?J+K]? -???????&P?7 H -??!????b?h??=???^f^???,2??(??l\????O363???}???X;?o?!???3|? ?f[F$?{? =???r*z1??0Hg?k??z???j??9.?G_?8 ??P???V???????_k ?w6??8????lA??????(?[?B?~c%????B???!f??^???y???-Cfa??????????h?j~?q -??{#??{??xk??????>??)?)?(K?jv??y&5?v d?9?p{?X??v?L????-8[?"J?jh?>k}?L6???????b?)???Y????^????i??j???7T?D?????j? ?5?? -bN?.\?p????[??E?3? 0G???5={?Y??d?\?~??Y?s??Zk?? -V?jE??by???????D?????']'iA??BZ???]???ro???}?r>r?B???S#??.?%???~}_!? -??Rs?n?\?I!??yY?l??e?d?`j?hGF??????D ???P??%qG?7v'???$B?44}?4??C?v -?? ?s??D?Z-?????2?????`??#w[ ?f{,?f8?]?z???8? _Wz]?LOu*????)???j??????????c??o,?DK??k?AW?W_jm??;RE{??f??}??????{}gO}S?W\??j-?O'????0m?????T4!?*>{?s????k?}?K???4??)?????2????8:??0+wMk??/???x???M?[?I????aa^???1=?{??Q?a-?/??????&%[?0InP)F@????k??R ?&????????O?rK#??{?}?????^t?+Br?P9J?\??$?%?????.??d????=?P3???kZ?7??v?vi |V???B??w???<???????M?*h???$????6????????\`7??qY??Lr at c$/1???tw?w?*??(p?p???y?8?}+E???.1? X??O?m?#?;f?i?F?5?)u??S d??2???\?Gf_s?J 4?4?????????:??F?j????{4Q?+ Q?=GX5`???????oE???U???D??;??p??J?????f??t+??/??3???? iL??;h???U??'\?x???????8??"??+???f?z????? -e??????(?_?Q?? -F??n?c??????/%?y%?p???^S?7[`]p8??Y??:??4????*I?!8????=??],??]????A[?#?????~NJ?`?9B???o?????x.a3b?8?7?4???????{??M??^???"'?q@ T`?N?|??3????F?z?????s???}???????4%G?\??N?? -:'??'<7?=???(R??5??w? -???7?,L?????#??????I??????*???863??-???^s?????9?J?&?????????? +t?2d?O*W?D$? 2??p?i ?i ??!?????}??R?T??f??1?^??"@???????j(B%??9?y???????w?8??^???lZ??c???kx9]?R???S?~??nU??@?lu?)?k! ;?-'??t*!r????p?K?@?}????????2???q????a?5?D?????K?]XZAj????7?2????x??#r??&B2?G??+??Q|6??P?tK)? ???Vw3??s?????k??h?6??Br?I?$%N;\?Oq?#;??^??K??????C?V?????q??T??9?6B%????C\.2???4???I/7O?? ??r?o$??_ ???(A?????/?4d?e?*?,4???qS?^nv???]@L&%???Nu>?V??K|???/ -??$^{?d?? ???_??ZC???????O???;???t?8?LJ?jr ???lP?c????E?B?idM??f?&??K?0f;?9?}?) x??+?????YGX$??g??? ?\???k??/C -5?~?G???????7d?wPZ??LL?e{?s??=??=J3?????=??>x????FbR???=?l??dY? ????m?Vn?,?_ ???Y????\??F1?Va??a;?&?u??C==Y?/Zr%??]?BX???IX???$<?W1????In????uIh?n[rN?~U?Q????@????L?>{?S????"'??????0?Ie?? c?<.?g9????*???????A 8????t??a?.??Zn??'l?R?(??? I9Y??#'y??h?R?D??? -2????u?O?????? ???????[?s ?G~??????u?3??3 -??b?S~U"+?ic??? ??H?V?????????7a=Bd=???%??Xr0r??'??????gLdy)?!1????f???????????.q~ -??a3?????? 1?N0?T??/???-Uc??i??e=U~d:?????3??.?|?? ??r??Nm?/K?J???c???J?^?9%?l?y?????u??H?? -?Y????Tv\v?H?D??m?nY??I????]????U??x?v????D????+?n&?M?\L)O????7??y???ZK???!r?*AE???]?^c??S%?r?? sx??0Q??$d???e???G?????!?1?w\?~a???}?*??7?????WO?@-SX??k?%rK????j??.?E?Q{|??X?f????,K}?2|??????c??j?O??D?b???N*?0???G??fZ?*?%?}??? -?????-???B;9c??????9g??' -?~'???7u> ???CM????E??%??mJF? Gu`?????e??_????O$?I? ???6??!???@I?o?6???B???Pq??\p?H??????YH? ??@i??a?L??GQ?.4?m?/a9????&??9?/??\?f?q?C??u]?t????(??;?p ??Y???"??Z?/x}O?~?{{?W?Y-???- |?????a??Nb??N?? -kq)wR?aP???????J 9??UJ|?4?)????+[9????????"??~????????????7;]??gNf?????t ??.??4y,????I??d?g?z??qu???? -:5??J?]???S7????Z????????xm(???U????.?????`??2?lZ??c?HFD?BS???IO???U2n??A,J??U?????sM??????:??2iQM?JRK??]????)l??]?4S?????9]??xp]??;^ 6r????u^%????h:?v(????Yt???iW?  ?@y?c+???F?{7 ??V?M????L???X? ?^q???X?g- ??^?3+???{a?????0?i-9?.?W?????]OSJ???y?&? ??'_[n?,?????O??}Dl??J???K??????3g??b??pQ)?E???????? -CQh?H????*????B_??G??????????c?`?}???kGG_X?? -??X?14?B?]-p?v?????????.??+y -4?|?????oz;4?]????????K`????W -???3P??S?F?w??????a(?hAv??F ??F|}???%??xn??X?J+??`??p??1c?'??k??`?k{?????C?@n?X??o?x%|?K?8x?????9r??g/??OfBrI}|=????HQ?k???????E??dn5'?}?}?KK2I ??,\??p`2????? ??????????&y????[9?H?????s??)?_I?T???z7?j?g.?????0?8?qi?\???????m?j??????QE?????9).?h????93?? -??????z?`}7??B????????)w?X!,?2II +???]g+4??[????@?????}?`??U??~)R? JhO|???u?n??,???tKW%J??q??a?[*'?E?iE??W?????-1???O??U??-lg?????I?????N4????-/??f?l4?:8"???????/?>??Y???fT\MY?.1?F?????L?N? o -?!ztt?(????=?Z?]????P?}3???_????????@?;?9???6T??iJ -??n???x[ -?K??????M{?h?P_?f?a?=?\ ??CJ?????ZE'???????!#?hB????w?o?!? ??????'#'?R?"?? ?\?!????????.?a'W????U1`?Vb?wg?W???????1ma?????IB???-_?W"a????7 ??????r&\A5?}??D???v??:?/?????m]3?w%??V??????56?l??+n{?l??1???*???eD,+?B?#???????+t??`?U-^}?S??&??? ??????"%?? ?:?Y??0?}??1>????;zk}Or???;??@x?Ng???U? U?u$??yg?OH? -<`5??W??!?F ??S? y#?????????h{(???'HU?wu4?????6??^?u?-@/???O???}?? -f?O_m=?CE????!t[????B7?z??q?h???P"La6?4?s>?0Z??S??MZ?M??M^Y??q-xV????Rv??????F?????#???A????,>2??fn?3@??????\?????????0??rQ?fI??d??3???@6?r??j??-l?7?F?,??r??('KU? E?$??rz?&??"? - ???????s+????nEq)???????,????o_??'???.KaD.?\????5?|?h?/yLf???EC??I? }???? ???D??~??S????#?aw"????dzR????nn??>??????????T -???BW?l??r?Sy????nAtl??p?%K?>???w???? -??+q??n? ??`rh??~?+?W%8l?l%??????bS=+?F????^??m?{?9?v??>j???|????4?V? =????????(??('??7hK???(?CT???ebOjZ -"???P?????????????? e??+??o?6h?k????l??7????[?>24?>??V}I???-?????' -??m?F?c?^p?_J6>???????c????C?4??R'@%G??g?@e!(?Ko??? ???J?FU+??B??y?H?,???c??6???=?T??????W? ?: -?/UD?!xe,?w4???Kz?$R??b?K.3)-4R?a??)????e#??????????????N?O?2?E???v???V?{~B?wc???~?n.?'-???3?=?/aVL??),?\t??_m???}?M?4? ???*c??!?p?b2? b??~Y??????n??1r?t?-~{???t?Od%?????????MP???.?q???4Z5E?!?Ca?*7?4 ??C? -??y?H????? ???????* S}? ?????{??-?p???KF????S?e?fQ8J???xA:????????X??b}?Fu????-?Z???m????=d?u?q?N-}V>??/??b#??8w?j???BC?$E?d/????????????1?wf??`,???U???oq????9Xy???Pb?Ik??????#H6"???y"z]G?+? R?????/??'?]f???F?ZK)?M?}?)???=d?sK????H??#InFFK????X?s?Y/?x?>??][? ??Un>!?Z.?Dk?C??Y2n???-??G?f??:"C?'?5?| `? ? Fp*D??!? ??Y????a?w?Yn\ ?#a8?5?n?? wS???0?'??_;|?X???01z???w??u???& '?%|RA???5??sH>?1??;=.?????d~???z -?$???8 ;]-s9+N^*?f?1?"?TC9?1????(>?3c?@???i'??? es?? -??\???]k?eK???n??b?? -&@???u??g???q~????j?Z#'??#$???F????FN???w??lm???*?m?????|a???o ?vn>??????f???_m??@Y|Xug?\?? ?7???N!????j??q????yt????$;f??j*H?gRPs???2 T?Do ?H??j?zF Aa^=??a????%??*z ?yI? ???!? ??????nIw4?Gv.Nbv?\?Z~??u??0KY0?xU??Y#?????h? J4?@?\n[??5??W????,&?R?? -??:%???I???fGm??u3?b?_PJ????????kp????7??^??m0????g?YZ \ No newline at end of file +????f?d??H??f??T?D;??FN???s?W??2????$=?o??GBNg???6???#R??>??8?(_? +-???=?QhZ???z??9??p???d::?/??#???-???T? S???~4?[X%?????????=?8_?%?n6!??z??\????x?S??#???U?y?-??R?zwS?E???>/??@??_?q?)?[?t? +??S?vR?Np??????P"Y???.???\:???R?????_/?????D?6j??V?? sb??p???????f?y??K?h??/1???|?1????p?nf????p???B +?# ???p8????? ?KC??}^?jkW??XLO??N? `??????S?m5>8????? '?~?U?hS???2???t@a?r?{?[?mV???t??J???F????????3@??p????*?/p ,?}??U???k?VjCL??:qeM"?s]????/$??? ??'??8?<??_oCw??S???0?q??W????|?Xb +` ?=n<^?"?g????6oyH?yB&(??xbI???F?V4???'???"???wW?a?G??W|?Z!??????6????#??6?x???I ??{?3???z? Z?%Y:???4??RR???????dUWKy +?D?]??G?!^h?X^?+W ?????'x? ????? +?N?3????[??Wo???????gFp???#?? +??z?L??p'N?G 1CuN$H?{????1?h????.???r{=J^\???g????  +?$?]???k??j??R???J??)?`?? +??/? ?????y??0Qx?????r??j=??????w??h?? +5??x?+?? +??8H?&?Hs?GQ???#Y?&???THCQ;?&?E9gvv]~r +?^[??????R????????;?"D??Go???:\m???vcTH?=?a0g????|-?qvr?'??ZB?=D???~$A??q??B??R?? Oe??|o??}???E:?` ??????4]O?c%A_\?;:?m?????!???$#G????%??j????????Q?)?F????/R?2??,??#T\5??<?}E([@(??? ???A??R5??:G?[U??w?cYkZR???????????u??N?tGf?i=??I???Vz;?(?????Ds???????????????v @??????s?z?G????????:??M??d??" +???|'????!h?m+ at 9?.`Y?}_???^~(AF??Y?????M?!???N??6????$????n?w??7?}??Sws?E??r??K??e???` J?H??*????B???N?E at Q??%?0M???&??ig6)??R?C??/?rQ????7?6 F?q~?c??????{?N???_?E?? +??<-??#?8 ??swh?G`???9?j??3,Q??????y??4?a???P?f?$?e????????pN?? +???Y?q??[f?4K?????????3;=??,B;%mB???]??9{??? +}?z&n??? ???|?e+???Y???@A;8q?;????]K?T?C? +f????h_??4V?P?7`??F6?p??.?w??A???????ZS?N???K???????23?=?|g?N???,T?Q??1??R??M8dl1/??????b?YK???bE??|Z??i????`3?? +?E?Y?K???????-???!'E(fUH^?Q????JC???? +f?hO????.??-??v=J???s????vtk?d?h?7??h(?^?Qd?FQ?\P?qm???\. ?uo.(7?g?0?uB VY?3??w???????P?2?q??'?&W%?f +7?w??5?_?c?6?8?G??em????G?E +T2?~S??Sj?L+????8???A??? z??R??b???B?G ?m??????/?8*^D??7v?)?qi+S??% ?Ed????:n0?RQ??[TjF????H=??%????1{p??A???t?Ih~f???{?????6m????S?P??X????b?o?\???UT??N?CH?J{e???L ??f?CU???26?b??1 +'?i?^?N<{=?)?O?X Og?+;|Y"?u???w??:????|?d?b??? ?3?W?~U?g-?QFb???;D?!?U??rE?0?h}?7Z{??????TF??j??????L=y???'p?T~????d+5?3Q?????}?^???w:>z`?? +uy_j@ +?I????d[?xk ?u??W????.V??)??l l?S?1?2?=?$??^ ??o ???`NH6??{??%;??O?,???l???i?a???*,Xl??Z?m8q?0v;uI?;???PC?+?-x??~???.M=?'t?d?????GC????)??D????/?z??'?)J?N?x3??M.v!*4???05???QJ,???K?$????UU?V?N,??T??3v? ;7??o???f???V?A??j??|?,?P?????????F V????I??T???t????GE???t?u ?H??S$m?)?/?{?m???V????????b????~ +????????s-???????[.d?!?z??Z?????"?:+`^_I???dl`??k?g???Z?s?f? ???7ML??u?w= +???y4???z??O????Z@?um/???l???R??G?@T??????vf?H?^-??TF??????????4&???!????Tl?/t?z;??3E??Z???bTDH?k???sg?$Ws:?P???????[???g???O????????1(?W????? ?=??X?gI83?#???? +J??Q.??????e at 5h?$?e0?M??I??c6$?????!T%?r??w?0 }w?v????8?????`!y L5??lS?3???^?a/????Db??!?`Aa?1W?1??lGI)h??0SO???G?%????~/l??*??????0%?wL????|???????????h0DF????1???N0?)z{Ol-?+??????X?5????:????g??8??????x??BH???\??,?I?u?????t?CKo?????????h??x?wQ?????? +???AQ?a?N???C,?2????.Y1A?^l?????P?)?6???????h3?dJ???J8??$U?w??&?-Y}?EQ???h??T???z$H?{?????????C?+?z,??????'$?SZwm???U5?WX????N@?????7\?_>????u?R?? ?????????????S?cm?|?????p?"^??-?U???,?%?M???Jf?P,????? N?J??Nm?/?}(???\?O????U??S????/?o^??Y??0 ;.=w????Vc??)?>?u??&Fq??}2?? =?n?r?E????D???zz???k?\????A%m?=????ot?Vg]f1 +,??W??mc?????? ???Q +??o\h y(?JvZ??w???|a'S1s?LJ=ox?[?tN???Q???3?x??'???Y???r??82X????5^??????? dYd?uZe???b]???n??C?????/???????Z]?Qm?????d + ??M@/????|???YD?_?T?v??U???3???S?85{???C????????Q???K?RG??&???FLx??i??!???2]t%???|e???;?#%?`? +??N" Jg??c?C;A?)$K?&??^!??&?0????v???@_ 3?{???r^?s?n???0?~%????)??KC???Td?????j??i?A?t??P??o??)??*?>dW@???????(=???y??QYE +?&)]m?????????+????cNW??i???Q2??e???? (?B??*+??Xb??42`?1??-.?Tb/??J????n??????Lm?8????'.???@??6???~??????? +?j???? +6?/"B?[h?lH-?5}??k?-?p#????+b:?/ ??? ?u???x??Q?e??&????=?W???W???,W?|,??Y? z^ +?!?????|?y?R??@?????Q??n???{ lDJ?p?u?F/?l??f3?]? +??)n?????"??N ?G??)D$?? ???)B?2?????9fc?~??DG??"?@??r3?.????W?^;?y?Prgo?2?lxQ&???F???Zg?3?dX?\???7?q?` ??`??? ????????a?f??5[??Jq?9????w???7??%????S/D???4ImL?8KQ???A????q~ ??ux???????1?5c??????|q?`????M?p? >?)??V??5?~r[t??:?/n;/?J?6c?e/h??( 46Z????s???t?G?gcV??K?W?X?\)#2?.3?bE???"?4?????h??Nc?}??+G????8Sn???!nm?:??vXE??*g?q8=th%???g>???????K??O?7??_Mf???~?kX???H?[Q???M? +?_'H'???S??Kh????-????O??H???????; ?4??7?ol???e??W7????Y?h??????S??4?? ??@?dk?Z?]\?%?7+????????ro)gB2eB??;??D???F?9?nH??4?EZ5????q X?<8?w?b{+????"?=;O?jp?KTEm????c?dd?????? ?KgV^5M??M?P??????S8???????('?@?u0??"???a?R??@??ua??r(??D?C?B??fO????B?????zi M?v? ?Mmw???8L?? W?P{??)C?(?(?ac?e??*?????y???Z= ??Pz?E???? +?????I?]???-??U? +?_;?z??L^?3Z:?,%8?eaeJ 9|EG?l???UKOU??y?? v?#!/??>??`?K????~Y??W?j?s9??{??*p?????.C???? +?????_??b??H?,??3???:?R^??:Ad?eM??U?v}?? +i?9+a??~s??] "x???K0?c???J?Y???w????9{e??b[?I?$2??{?????f??n`V????I ?:??ru"S??&~a?K?? ??0gq;]" (?F? tD??`???b??e0?D?%????Cp??5-[?o?=?/(???jef?4??( +?Kz^;g?|?????c????4j5.??C?A?ny??0? +?&+????ju??'????pF?{"Vz0?X?w?u???i???}Q??N_?H?c????(?S???w?k????&?'i?R]?R???b?c[m`M +??E:? +?%;Ja~??=??Q????4$?s+?l??|?TL2??a??? +.?"??LR???O?.???m3R?M?&.?9y???????e ?f??T?vvo?k +?yXa k?|b=,???????5????? P;9?mUlw?2??2??'h???7????-???R9\??????k? Y?-???ft?|??^;?(yT??????????l\0???QJE??????????A????????????E?.???Z?????>????n:S??p?}??3???"1?H???v?????%????k~0??lk??A??M.??01j)K\L??P??U?&??q.\"????Ch???n?(_6G??0:gn_?? +?S gYCta?O????d??P.?E??X] +??m?*?????!`3??w?o?5 +qZ???}?$?t??+d??????s?xo+??$;U?$ G?,??84? ??"??= ?SLdq/?0??)9?l???v???R&g?tU?!?? +?_?fCs ? +??s<>???$?[`?G+??"?Wb???`?A?^???h0?+h?????>6w4 +"?_??K?"?~???+??O|?3?;2??b?+;?M?????v??f ?j?P??5??? ????BE$????? #xO????+p?????j?m????+??GF????t5? +C't?Q??i?o????'????d???l?l 86??|????X%??e=A??D??? +????:? ???z??rH??9?j?oG?Z???e]????>???1g?lR?h????E?y4?}^??ui????h?eE??L?cq???|?'e?>??Oo?"?'?/L?\?v ??p0??\{@?X?DZ?0 +?|brc~?R ????CwdQY??H?AeN???2w?E???????|e???%TDD???,#?y`??5??s?B&?W.?x'A????Gey????/ )?t]T&??U>?#q:?S???wC??p?Z?D)?/???^?L m???.?&}?  +??H@}?????Ics@?B?5{?mq????????q&?????'?????{? ?????H??Xd]?T?V???Y?7 ?;?1?????L?[????& +U?V??jn?m$?/?H??]??:a????g?YZ \ No newline at end of file Modified: pkg/CHNOSZ/inst/extdata/OBIGT/organic_aq.csv.xz =================================================================== --- pkg/CHNOSZ/inst/extdata/OBIGT/organic_aq.csv.xz 2018-11-11 04:55:31 UTC (rev 350) +++ pkg/CHNOSZ/inst/extdata/OBIGT/organic_aq.csv.xz 2018-12-21 15:03:57 UTC (rev 351) @@ -1,4 +1,4 @@ -?7zXZ???F!t/?????r?]7I??b???9??????TB;q?"?q???cL;?"??? x!#???0N???????? ?V?q??P?@o?*?~ ??!?~?&??????x?{;??Q(T?{????~W??U?@?? r?&?3??f1(\F?^??=W???d N8;h?c3??? -???I?H??t-f????U[????_???????? V".??[??|R?ZC??????K?Q???????7W ????U?+????IX?/ ??0??`zB????D?????,????-[?Gf?U?^???(?F??})2???????:?L???V??v??-}?;4??? ???R5?DE?`?#???? ?1Xl{?G????V??p?a????FmU??s}???m????C?????h??!u6 g9???s?^??6!??pP???o(k?6?#?[?6???m??3???(?O???\??5?*?]??F????oD??5? Ot]D2???jH?[???uN?&=}) ??}?Ey?????K?`??I4?m%8r?`_??????b8R? +???c?s?lhT??5??$???uH??%>]K???}??M?B`n[_??4? +??C/?T????[?=?f????p??????aIQ??? ???gV8????rF+?i`Y?o bKq?????$5k6??R[?1?7? +A????K?6??????H???????Re????8???LI?????&cx?t??y?:?Ud???@?DVp?2?Z?z??Q?!=!i???\W?O?????+???????????????ZI0??_r???(}?????? ++cC?se??sJ?4?.??B?yY?????m;??>????/?Za? ?$Lm?A???????z|?2'K???'4?~??q?!?u;??W=l6? ??Z??N??o(eC?@pl????????I??x????I?D?)??*??A?e #?(3??z??cx??????S???$>??;??]??.H?x????H?d???????>??N??K?%M??zN????M?"?@ _?H??????M??SU???e?}d"????El?????8?????,??O????y??2?;n??j??D??W????5 +-????Yf?wv^?b??????)???zeAo?^?I???K????A!e?/Zr:???-J??????V?Xl?K9vx+y?n?.Y?iJ>????wh ?N?(f?R????jM?-??x?????$?L?Q??? +?.rG???????O?F??$)??[?p +G:?\ +?ED?\?"??+?@3c?????????8/????@g???????? +?BY??9???~?O@?#?uWH???)}????@O ?? ??5??'D9q?\9??????dW??@???????????t?_??jF????? +nD???h)t G?_#??(=?8 )????I??Lr??{^oWs^????GDc!??? ??dQ??%?=?m?>?2?G?J?N ???kW?ex,Jq???6K??j??LO?.?Kxcj?i.?}J$B(?[??b? +????$?????kM{? .)h????)?x?????j??w,??_ 1T?>--F?KV#i? +???E?????m?|??;?e?????}\??h?=?????:Cf9?z?M?T?R +?!F?w???SI?UAj?U??5f???d ?b? V?}???V-??GC??9 +?r^? ???x?i?H?Sg?y^??S?H???D??_B?=?`??GP:T?????( +???????d-?7-82?9??n;:WGID??Cn?>???}??n?????4n?U ?E?@0?????I}?>?UYk????2??Ig?~`?hE?^1?? Q?p??? ?? +??>?g at Voyii?^?_5m?"???r???J(???9?4=?I??c2y7?Mo@?|??&?K?????M? Y ?d?H;B?D??H???7']LW?>>??Y;0M?;9???U????!Z-????*?YwVBZ?????l/? :U?ss:??aQ??H??4?V +?????WW? 5K??7??>A?? +??%?rDwN??A?[\???????\?Z??E???????d/????????] ? ?\j???????E??U??rd? ???0?A ??x3g5kH|~??g??????????1^???F??^?GQhe\[?????@???, ?[(\,a????z2?u??j?????G?????g}@??????2]?+?????R??]?5y?1?|???T|?$????? Y?HMQ(????hi?o?]#?G??_t*.????5?W???D?)??^-V +?????$????l???,xmK??L????>Y???:?h?c??:]?????????YDM"w?+?uX???ub ?^?z=-?(?????h????.?g??'?? [TRUNCATED] To get the complete diff run: svnlook diff /svnroot/chnosz -r 351