sofa.h | sofa.h | |||
---|---|---|---|---|
skipping to change at line 14 | skipping to change at line 14 | |||
/* | /* | |||
** - - - - - - - | ** - - - - - - - | |||
** s o f a . h | ** s o f a . h | |||
** - - - - - - - | ** - - - - - - - | |||
** | ** | |||
** Prototype function declarations for SOFA library. | ** Prototype function declarations for SOFA library. | |||
** | ** | |||
** This file is part of the International Astronomical Union's | ** This file is part of the International Astronomical Union's | |||
** SOFA (Standards Of Fundamental Astronomy) software collection. | ** SOFA (Standards Of Fundamental Astronomy) software collection. | |||
** | ** | |||
** This revision: 2009 January 29 | ** This revision: 2009 November 3 | |||
** | ** | |||
** Copyright (C) 2008 IAU SOFA Review Board. See notes at end. | ** SOFA release 2009-12-31 | |||
** | ||||
** Copyright (C) 2009 IAU SOFA Review Board. See notes at end. | ||||
*/ | */ | |||
#include "math.h" | #include "math.h" | |||
#ifdef __cplusplus | #ifdef __cplusplus | |||
extern "C" { | extern "C" { | |||
#endif | #endif | |||
/* Astronomy/Calendars */ | /* Astronomy/Calendars */ | |||
int iauCal2jd(int iy, int im, int id, double *djm0, double *djm); | int iauCal2jd(int iy, int im, int id, double *djm0, double *djm); | |||
skipping to change at line 56 | skipping to change at line 58 | |||
double iauFalp03(double t); | double iauFalp03(double t); | |||
double iauFama03(double t); | double iauFama03(double t); | |||
double iauFame03(double t); | double iauFame03(double t); | |||
double iauFane03(double t); | double iauFane03(double t); | |||
double iauFaom03(double t); | double iauFaom03(double t); | |||
double iauFapa03(double t); | double iauFapa03(double t); | |||
double iauFasa03(double t); | double iauFasa03(double t); | |||
double iauFaur03(double t); | double iauFaur03(double t); | |||
double iauFave03(double t); | double iauFave03(double t); | |||
/* Astronomy/Obsolete */ | ||||
void iauC2tceo(double rc2i[3][3], double era, double rpom[3][3], | ||||
double rc2t[3][3]); | ||||
/* Astronomy/PrecNutPolar */ | /* Astronomy/PrecNutPolar */ | |||
void iauBi00(double *dpsibi, double *depsbi, double *dra); | void iauBi00(double *dpsibi, double *depsbi, double *dra); | |||
void iauBp00(double date1, double date2, | void iauBp00(double date1, double date2, | |||
double rb[3][3], double rp[3][3], double rbp[3][3]); | double rb[3][3], double rp[3][3], double rbp[3][3]); | |||
void iauBp06(double date1, double date2, | void iauBp06(double date1, double date2, | |||
double rb[3][3], double rp[3][3], double rbp[3][3]); | double rb[3][3], double rp[3][3], double rbp[3][3]); | |||
void iauBpn2xy(double rbpn[3][3], double *x, double *y); | void iauBpn2xy(double rbpn[3][3], double *x, double *y); | |||
void iauC2i00a(double date1, double date2, double rc2i[3][3]); | void iauC2i00a(double date1, double date2, double rc2i[3][3]); | |||
void iauC2i00b(double date1, double date2, double rc2i[3][3]); | void iauC2i00b(double date1, double date2, double rc2i[3][3]); | |||
void iauC2i06a(double date1, double date2, double rc2i[3][3]); | void iauC2i06a(double date1, double date2, double rc2i[3][3]); | |||
skipping to change at line 208 | skipping to change at line 206 | |||
double *r5, double *d5, | double *r5, double *d5, | |||
double *dr5, double *dd5, double *px5, double *rv5); | double *dr5, double *dd5, double *px5, double *rv5); | |||
void iauHfk5z(double rh, double dh, double date1, double date2, | void iauHfk5z(double rh, double dh, double date1, double date2, | |||
double *r5, double *d5, double *dr5, double *dd5); | double *r5, double *d5, double *dr5, double *dd5); | |||
int iauStarpm(double ra1, double dec1, | int iauStarpm(double ra1, double dec1, | |||
double pmr1, double pmd1, double px1, double rv1, | double pmr1, double pmd1, double px1, double rv1, | |||
double ep1a, double ep1b, double ep2a, double ep2b, | double ep1a, double ep1b, double ep2a, double ep2b, | |||
double *ra2, double *dec2, | double *ra2, double *dec2, | |||
double *pmr2, double *pmd2, double *px2, double *rv2); | double *pmr2, double *pmd2, double *px2, double *rv2); | |||
/* Astronomy/Geodetic/Geocentric */ | ||||
int iauEform(int, double*, double*); | ||||
int iauGc2gd(int, double[3], double*, double*, double*); | ||||
int iauGc2gde(double, double, double[3], double*, double*, double*); | ||||
int iauGd2gc(int, double, double, double, double[3]); | ||||
int iauGd2gce(double, double, double, double, double, double[3]); | ||||
/* Astronomy/Timescales */ | /* Astronomy/Timescales */ | |||
int iauDat(int iy, int im, int id, double fd, double *deltat); | int iauDat(int iy, int im, int id, double fd, double *deltat); | |||
double iauDtdb(double date1, double date2, | double iauDtdb(double date1, double date2, | |||
double ut, double elong, double u, double v); | double ut, double elong, double u, double v); | |||
/* VectorMatrix/AngleOps */ | /* VectorMatrix/AngleOps */ | |||
void iauA2af(int ndp, double angle, char *sign, int idmsf[4]); | void iauA2af(int ndp, double angle, char *sign, int idmsf[4]); | |||
void iauA2tf(int ndp, double angle, char *sign, int ihmsf[4]); | void iauA2tf(int ndp, double angle, char *sign, int ihmsf[4]); | |||
double iauAnp(double a); | double iauAnp(double a); | |||
double iauAnpm(double a); | double iauAnpm(double a); | |||
skipping to change at line 295 | skipping to change at line 300 | |||
void iauS2xpv(double s1, double s2, double pv[2][3], double spv[2][3]); | void iauS2xpv(double s1, double s2, double pv[2][3], double spv[2][3]); | |||
void iauSxp(double s, double p[3], double sp[3]); | void iauSxp(double s, double p[3], double sp[3]); | |||
void iauSxpv(double s, double pv[2][3], double spv[2][3]); | void iauSxpv(double s, double pv[2][3], double spv[2][3]); | |||
#ifdef __cplusplus | #ifdef __cplusplus | |||
} | } | |||
#endif | #endif | |||
#endif | #endif | |||
/*----------------------------------------------------------------------- | /*---------------------------------------------------------------------- | |||
** | ** | |||
** Copyright (C) 2008 | ** Copyright (C) 2009 | |||
** Standards Of Fundamental Astronomy Review Board | ** Standards Of Fundamental Astronomy Review Board | |||
** of the International Astronomical Union. | ** of the International Astronomical Union. | |||
** | ** | |||
** ===================== | ** ===================== | |||
** SOFA Software License | ** SOFA Software License | |||
** ===================== | ** ===================== | |||
** | ** | |||
** NOTICE TO USER: | ** NOTICE TO USER: | |||
** | ** | |||
** BY USING THIS SOFTWARE YOU ACCEPT THE FOLLOWING TERMS AND CONDITIONS | ** BY USING THIS SOFTWARE YOU ACCEPT THE FOLLOWING TERMS AND CONDITIONS | |||
** WHICH APPLY TO ITS USE. | ** WHICH APPLY TO ITS USE. | |||
** | ** | |||
** 1. The Software is owned by the IAU SOFA Review Board ("the Board"). | ** 1. The Software is owned by the IAU SOFA Review Board ("SOFA"). | |||
** | ** | |||
** 2. Permission is granted to anyone to use the SOFA software for any | ** 2. Permission is granted to anyone to use the SOFA software for any | |||
** purpose, including commercial applications, free of charge and | ** purpose, including commercial applications, free of charge and | |||
** without payment of royalties, subject to the conditions and | ** without payment of royalties, subject to the conditions and | |||
** restrictions listed below. | ** restrictions listed below. | |||
** | ** | |||
** 3. You (the user) may copy and adapt the SOFA software and its | ** 3. You (the user) may copy and distribute SOFA source code to others, | |||
** algorithms for your own purposes and you may copy and distribute | ** and use and adapt its code and algorithms in your own software, | |||
** a resulting "derived work" to others on a world-wide, royalty-free | ** on a world-wide, royalty-free basis. That portion of your | |||
** basis, provided that the derived work complies with the following | ** distribution that does not consist of intact and unchanged copies | |||
** requirements: | ** of SOFA source code files is a "derived work" that must comply | |||
** with the following requirements: | ||||
** | ** | |||
** a) Your work shall be marked or carry a statement that it (i) uses | ** a) Your work shall be marked or carry a statement that it | |||
** routines and computations derived by you from software provided | ** (i) uses routines and computations derived by you from | |||
** by SOFA under license to you; and (ii) does not contain | ** software provided by SOFA under license to you; and | |||
** software provided by SOFA or software that has been distributed | ** (ii) does not itself constitute software provided by and/or | |||
** by or endorsed by SOFA. | ** endorsed by SOFA. | |||
** | ** | |||
** b) The source code of your derived work must contain descriptions | ** b) The source code of your derived work must contain descriptions | |||
** of how the derived work is based upon and/or differs from the | ** of how the derived work is based upon, contains and/or differs | |||
** original SOFA software. | ** from the original SOFA software. | |||
** | ||||
** c) The name(s) of all routine(s) that you distribute shall differ | ||||
** from the SOFA names, even when the SOFA content has not been | ||||
** otherwise changed. | ||||
** | ** | |||
** d) The routine-naming prefix "iau" shall not be used. | ** c) The name(s) of all routine(s) in your derived work shall not | |||
** include the prefix "iau_". | ||||
** | ** | |||
** e) The origin of the SOFA components of your derived work must not | ** d) The origin of the SOFA components of your derived work must | |||
** be misrepresented; you must not claim that you wrote the | ** not be misrepresented; you must not claim that you wrote the | |||
** original software, nor file a patent application for SOFA | ** original software, nor file a patent application for SOFA | |||
** software or algorithms embedded in the SOFA software. | ** software or algorithms embedded in the SOFA software. | |||
** | ** | |||
** f) These requirements must be reproduced intact in any source | ** e) These requirements must be reproduced intact in any source | |||
** distribution and shall apply to anyone to whom you have granted | ** distribution and shall apply to anyone to whom you have | |||
** a further right to modify the source code of your derived work. | ** granted a further right to modify the source code of your | |||
** derived work. | ||||
** | ||||
** Note that, as originally distributed, the SOFA software is | ||||
** intended to be a definitive implementation of the IAU standards, | ||||
** and consequently third-party modifications are discouraged. All | ||||
** variations, no matter how minor, must be explicitly marked as | ||||
** such, as explained above. | ||||
** | ** | |||
** 4. In any published work or commercial products which includes | ** 4. In any published work or commercial products which includes | |||
** results achieved by using the SOFA software, you shall acknowledge | ** results achieved by using the SOFA software, you shall | |||
** that the SOFA software was used in obtaining those results. | ** acknowledge that the SOFA software was used in obtaining those | |||
** results. | ||||
** | ** | |||
** 5. You shall not cause the SOFA software to be brought into | ** 5. You shall not cause the SOFA software to be brought into | |||
** disrepute, either by misuse, or use for inappropriate tasks, or by | ** disrepute, either by misuse, or use for inappropriate tasks, or | |||
** inappropriate modification. | ** by inappropriate modification. | |||
** | ** | |||
** 6. The SOFA software is provided "as is" and the Board makes no | ** 6. The SOFA software is provided "as is" and SOFA makes no warranty | |||
** warranty as to its use or performance. The Board does not and | ** as to its use or performance. SOFA does not and cannot warrant | |||
** cannot warrant the performance or results which the user may obtain | ** the performance or results which the user may obtain by using the | |||
** by using the SOFA software. The Board makes no warranties, express | ** SOFA software. SOFA makes no warranties, express or implied, as | |||
** or implied, as to non-infringement of third party rights, | ** to non-infringement of third party rights, merchantability, or | |||
** merchantability, or fitness for any particular purpose. In no | ** fitness for any particular purpose. In no event will SOFA be | |||
** event will the Board be liable to the user for any consequential, | ** liable to the user for any consequential, incidental, or special | |||
** incidental, or special damages, including any lost profits or lost | ** damages, including any lost profits or lost savings, even if a | |||
** savings, even if a Board representative has been advised of such | ** SOFA representative has been advised of such damages, or for any | |||
** damages, or for any claim by any third party. | ** claim by any third party. | |||
** | ** | |||
** 7. The provision of any version of the SOFA software under the terms | ** 7. The provision of any version of the SOFA software under the terms | |||
** and conditions specified herein does not imply that future | ** and conditions specified herein does not imply that future | |||
** versions will also be made available under the same terms and | ** versions will also be made available under the same terms and | |||
** conditions. | ** conditions. | |||
** | ** | |||
** Correspondence concerning SOFA software should be addressed as | ** Correspondence concerning SOFA software should be addressed as | |||
** follows: | ** follows: | |||
** | ** | |||
** Internet email: sofa@rl.ac.uk | ** By email: sofa@rl.ac.uk | |||
** Postal address: IAU SOFA Center | ** By post: IAU SOFA Center | |||
** Rutherford Appleton Laboratory | ** STFC Rutherford Appleton Laboratory | |||
** Chilton, Didcot, Oxon OX11 0QX | ** Harwell Science and Innovation Campus | |||
** United Kingdom | ** Didcot, Oxfordshire, OX11 0QX | |||
** United Kingdom | ||||
** | ** | |||
**---------------------------------------------------------------------*/ | **--------------------------------------------------------------------*/ | |||
End of changes. 18 change blocks. | ||||
50 lines changed or deleted | 62 lines changed or added | |||
sofam.h | sofam.h | |||
---|---|---|---|---|
skipping to change at line 14 | skipping to change at line 14 | |||
/* | /* | |||
** - - - - - - - - | ** - - - - - - - - | |||
** s o f a m . h | ** s o f a m . h | |||
** - - - - - - - - | ** - - - - - - - - | |||
** | ** | |||
** Macros used by SOFA library. | ** Macros used by SOFA library. | |||
** | ** | |||
** This file is part of the International Astronomical Union's | ** This file is part of the International Astronomical Union's | |||
** SOFA (Standards Of Fundamental Astronomy) software collection. | ** SOFA (Standards Of Fundamental Astronomy) software collection. | |||
** | ** | |||
** This revision: 2009 January 29 | ** This revision: 2009 December 18 | |||
** | ** | |||
** Copyright (C) 2008 IAU SOFA Review Board. See notes at end. | ** SOFA release 2009-12-31 | |||
** | ||||
** Copyright (C) 2009 IAU SOFA Review Board. See notes at end. | ||||
*/ | */ | |||
#include "sofa.h" | #include "sofa.h" | |||
/* Seconds of time per radian */ | /* Seconds of time per radian */ | |||
#define DS2R (7.272205216643039903848712e-5) | #define DS2R (7.272205216643039903848712e-5) | |||
/* Pi */ | /* Pi */ | |||
#define DPI (3.141592653589793238462643) | #define DPI (3.141592653589793238462643) | |||
skipping to change at line 48 | skipping to change at line 50 | |||
/* Arcseconds in a full circle */ | /* Arcseconds in a full circle */ | |||
#define TURNAS (1296000.0) | #define TURNAS (1296000.0) | |||
/* Milliarcseconds to radians */ | /* Milliarcseconds to radians */ | |||
#define DMAS2R (DAS2R / 1e3) | #define DMAS2R (DAS2R / 1e3) | |||
/* Length of tropical year B1900 (days) */ | /* Length of tropical year B1900 (days) */ | |||
#define DTY (365.242198781) | #define DTY (365.242198781) | |||
/* Reference epoch (J2000), Julian Date */ | /* Reference epoch (J2000.0), Julian Date */ | |||
#define DJ00 (2451545.0) | #define DJ00 (2451545.0) | |||
/* Julian Date of Modified Julian Date zero */ | /* Julian Date of Modified Julian Date zero */ | |||
#define DJM0 (2400000.5) | #define DJM0 (2400000.5) | |||
/* Reference epoch (J2000), Modified Julian Date */ | /* Reference epoch (J2000.0), Modified Julian Date */ | |||
#define DJM00 (51544.5) | #define DJM00 (51544.5) | |||
/* Seconds per day. */ | /* Seconds per day. */ | |||
#define DAYSEC (86400.0) | #define DAYSEC (86400.0) | |||
/* Days per Julian year */ | /* Days per Julian year */ | |||
#define DJY (365.25) | #define DJY (365.25) | |||
/* Days per Julian century */ | /* Days per Julian century */ | |||
#define DJC (36525.0) | #define DJC (36525.0) | |||
skipping to change at line 86 | skipping to change at line 88 | |||
#define dint(A) ((A)<0.0?ceil(A):floor(A)) | #define dint(A) ((A)<0.0?ceil(A):floor(A)) | |||
/* dnint(A) - round to nearest whole number (double) */ | /* dnint(A) - round to nearest whole number (double) */ | |||
#define dnint(A) ((A)<0.0?ceil((A)-0.5):floor((A)+0.5)) | #define dnint(A) ((A)<0.0?ceil((A)-0.5):floor((A)+0.5)) | |||
/* dsign(A,B) - magnitude of A with sign of B (double) */ | /* dsign(A,B) - magnitude of A with sign of B (double) */ | |||
#define dsign(A,B) ((B)<0.0?-(A):(A)) | #define dsign(A,B) ((B)<0.0?-(A):(A)) | |||
#endif | #endif | |||
/*----------------------------------------------------------------------- | /*---------------------------------------------------------------------- | |||
** | ** | |||
** Copyright (C) 2008 | ** Copyright (C) 2009 | |||
** Standards Of Fundamental Astronomy Review Board | ** Standards Of Fundamental Astronomy Review Board | |||
** of the International Astronomical Union. | ** of the International Astronomical Union. | |||
** | ** | |||
** ===================== | ** ===================== | |||
** SOFA Software License | ** SOFA Software License | |||
** ===================== | ** ===================== | |||
** | ** | |||
** NOTICE TO USER: | ** NOTICE TO USER: | |||
** | ** | |||
** BY USING THIS SOFTWARE YOU ACCEPT THE FOLLOWING TERMS AND CONDITIONS | ** BY USING THIS SOFTWARE YOU ACCEPT THE FOLLOWING TERMS AND CONDITIONS | |||
** WHICH APPLY TO ITS USE. | ** WHICH APPLY TO ITS USE. | |||
** | ** | |||
** 1. The Software is owned by the IAU SOFA Review Board ("the Board"). | ** 1. The Software is owned by the IAU SOFA Review Board ("SOFA"). | |||
** | ** | |||
** 2. Permission is granted to anyone to use the SOFA software for any | ** 2. Permission is granted to anyone to use the SOFA software for any | |||
** purpose, including commercial applications, free of charge and | ** purpose, including commercial applications, free of charge and | |||
** without payment of royalties, subject to the conditions and | ** without payment of royalties, subject to the conditions and | |||
** restrictions listed below. | ** restrictions listed below. | |||
** | ** | |||
** 3. You (the user) may copy and adapt the SOFA software and its | ** 3. You (the user) may copy and distribute SOFA source code to others, | |||
** algorithms for your own purposes and you may copy and distribute | ** and use and adapt its code and algorithms in your own software, | |||
** a resulting "derived work" to others on a world-wide, royalty-free | ** on a world-wide, royalty-free basis. That portion of your | |||
** basis, provided that the derived work complies with the following | ** distribution that does not consist of intact and unchanged copies | |||
** requirements: | ** of SOFA source code files is a "derived work" that must comply | |||
** with the following requirements: | ||||
** | ** | |||
** a) Your work shall be marked or carry a statement that it (i) uses | ** a) Your work shall be marked or carry a statement that it | |||
** routines and computations derived by you from software provided | ** (i) uses routines and computations derived by you from | |||
** by SOFA under license to you; and (ii) does not contain | ** software provided by SOFA under license to you; and | |||
** software provided by SOFA or software that has been distributed | ** (ii) does not itself constitute software provided by and/or | |||
** by or endorsed by SOFA. | ** endorsed by SOFA. | |||
** | ** | |||
** b) The source code of your derived work must contain descriptions | ** b) The source code of your derived work must contain descriptions | |||
** of how the derived work is based upon and/or differs from the | ** of how the derived work is based upon, contains and/or differs | |||
** original SOFA software. | ** from the original SOFA software. | |||
** | ||||
** c) The name(s) of all routine(s) that you distribute shall differ | ||||
** from the SOFA names, even when the SOFA content has not been | ||||
** otherwise changed. | ||||
** | ** | |||
** d) The routine-naming prefix "iau" shall not be used. | ** c) The name(s) of all routine(s) in your derived work shall not | |||
** include the prefix "iau_". | ||||
** | ** | |||
** e) The origin of the SOFA components of your derived work must not | ** d) The origin of the SOFA components of your derived work must | |||
** be misrepresented; you must not claim that you wrote the | ** not be misrepresented; you must not claim that you wrote the | |||
** original software, nor file a patent application for SOFA | ** original software, nor file a patent application for SOFA | |||
** software or algorithms embedded in the SOFA software. | ** software or algorithms embedded in the SOFA software. | |||
** | ** | |||
** f) These requirements must be reproduced intact in any source | ** e) These requirements must be reproduced intact in any source | |||
** distribution and shall apply to anyone to whom you have granted | ** distribution and shall apply to anyone to whom you have | |||
** a further right to modify the source code of your derived work. | ** granted a further right to modify the source code of your | |||
** derived work. | ||||
** | ||||
** Note that, as originally distributed, the SOFA software is | ||||
** intended to be a definitive implementation of the IAU standards, | ||||
** and consequently third-party modifications are discouraged. All | ||||
** variations, no matter how minor, must be explicitly marked as | ||||
** such, as explained above. | ||||
** | ** | |||
** 4. In any published work or commercial products which includes | ** 4. In any published work or commercial products which includes | |||
** results achieved by using the SOFA software, you shall acknowledge | ** results achieved by using the SOFA software, you shall | |||
** that the SOFA software was used in obtaining those results. | ** acknowledge that the SOFA software was used in obtaining those | |||
** results. | ||||
** | ** | |||
** 5. You shall not cause the SOFA software to be brought into | ** 5. You shall not cause the SOFA software to be brought into | |||
** disrepute, either by misuse, or use for inappropriate tasks, or by | ** disrepute, either by misuse, or use for inappropriate tasks, or | |||
** inappropriate modification. | ** by inappropriate modification. | |||
** | ** | |||
** 6. The SOFA software is provided "as is" and the Board makes no | ** 6. The SOFA software is provided "as is" and SOFA makes no warranty | |||
** warranty as to its use or performance. The Board does not and | ** as to its use or performance. SOFA does not and cannot warrant | |||
** cannot warrant the performance or results which the user may obtain | ** the performance or results which the user may obtain by using the | |||
** by using the SOFA software. The Board makes no warranties, express | ** SOFA software. SOFA makes no warranties, express or implied, as | |||
** or implied, as to non-infringement of third party rights, | ** to non-infringement of third party rights, merchantability, or | |||
** merchantability, or fitness for any particular purpose. In no | ** fitness for any particular purpose. In no event will SOFA be | |||
** event will the Board be liable to the user for any consequential, | ** liable to the user for any consequential, incidental, or special | |||
** incidental, or special damages, including any lost profits or lost | ** damages, including any lost profits or lost savings, even if a | |||
** savings, even if a Board representative has been advised of such | ** SOFA representative has been advised of such damages, or for any | |||
** damages, or for any claim by any third party. | ** claim by any third party. | |||
** | ** | |||
** 7. The provision of any version of the SOFA software under the terms | ** 7. The provision of any version of the SOFA software under the terms | |||
** and conditions specified herein does not imply that future | ** and conditions specified herein does not imply that future | |||
** versions will also be made available under the same terms and | ** versions will also be made available under the same terms and | |||
** conditions. | ** conditions. | |||
** | ** | |||
** Correspondence concerning SOFA software should be addressed as | ** Correspondence concerning SOFA software should be addressed as | |||
** follows: | ** follows: | |||
** | ** | |||
** Internet email: sofa@rl.ac.uk | ** By email: sofa@rl.ac.uk | |||
** Postal address: IAU SOFA Center | ** By post: IAU SOFA Center | |||
** Rutherford Appleton Laboratory | ** STFC Rutherford Appleton Laboratory | |||
** Chilton, Didcot, Oxon OX11 0QX | ** Harwell Science and Innovation Campus | |||
** United Kingdom | ** Didcot, Oxfordshire, OX11 0QX | |||
** United Kingdom | ||||
** | ** | |||
**---------------------------------------------------------------------*/ | **--------------------------------------------------------------------*/ | |||
End of changes. 18 change blocks. | ||||
48 lines changed or deleted | 57 lines changed or added | |||