robert_dodier [Sat, 25 Aug 2007 17:11:29 +0000 (25 17:11 +0000)]
Roll version number forward to 5.13.0.
robert_dodier [Sun, 19 Aug 2007 15:57:13 +0000 (19 15:57 +0000)]
New file ChangeLog-5.13.0.
robert_dodier [Sat, 18 Aug 2007 17:21:48 +0000 (18 17:21 +0000)]
Roll version number forward to 5.12.99rc2.
vvzhy [Tue, 14 Aug 2007 19:18:53 +0000 (14 19:18 +0000)]
Fix environment variable name maxima_gccver -> mingw_gccver
vvzhy [Sun, 5 Aug 2007 12:37:27 +0000 (5 12:37 +0000)]
Full path to installed maxima.bat
robert_dodier [Sat, 4 Aug 2007 19:44:13 +0000 (4 19:44 +0000)]
Commit minor changes from trunk to release branch.
robert_dodier [Sat, 4 Aug 2007 16:30:58 +0000 (4 16:30 +0000)]
Put share_testsuite.mac and contrib/rtest_lsquares.mac on list of share files.
riotorto [Fri, 3 Aug 2007 22:28:40 +0000 (3 22:28 +0000)]
Some small changes to avoid errors in texi2pdf
robert_dodier [Fri, 3 Aug 2007 15:54:25 +0000 (3 15:54 +0000)]
Repair rtest8 #69 (put named variable in expression instead of %%).
robert_dodier [Fri, 3 Aug 2007 05:39:48 +0000 (3 05:39 +0000)]
Increase tolerance for rtest8 #69 (find_root example) so it succeeds.
robert_dodier [Fri, 3 Aug 2007 05:38:49 +0000 (3 05:38 +0000)]
(1) New global variable float_approx_equal_tolerance, which is
the tolerance applied by the function float_approx_equal
(for comparison of floating point values in the testsuite).
(2) Rename dfloat_approx_equal to float_approx_equal
(other float functions are all float_foo; Maxima uses only
double precision so no need to try to distinguish double float).
robert_dodier [Fri, 3 Aug 2007 05:34:44 +0000 (3 05:34 +0000)]
Make simplode behave according to documentation
(separator string is now "" instead of "&").
robert_dodier [Fri, 3 Aug 2007 05:33:39 +0000 (3 05:33 +0000)]
Adjust an expected result to accomodate current testsuite code
(expected results are not evaluated now).
robert_dodier [Fri, 3 Aug 2007 05:32:23 +0000 (3 05:32 +0000)]
Assign greater tolerance to float_approx_equal_tolerance (new global) for all tests.
robert_dodier [Fri, 3 Aug 2007 05:31:13 +0000 (3 05:31 +0000)]
Update test cases and expected results to be appropriate
for current versions of defstruct code and testsuite code.
robert_dodier [Fri, 3 Aug 2007 05:29:37 +0000 (3 05:29 +0000)]
(1) Assign a greater tolerance for floating point numbers.
(2) Change all Lisp strings in expected results to Maxima strings.
robert_dodier [Fri, 3 Aug 2007 05:27:51 +0000 (3 05:27 +0000)]
Change sconcat to concat throughout, so that results
contain Maxima strings instead of Lisp strings.
That makes it easier to test that expected results are produced.
robert_dodier [Fri, 3 Aug 2007 05:25:21 +0000 (3 05:25 +0000)]
Load package before running test.
robert_dodier [Fri, 3 Aug 2007 05:19:26 +0000 (3 05:19 +0000)]
New script to set up testsuite_files so that run_testsuite runs
tests in share packages. Initial revision runs all rtest*.mac scripts in share
except for all the ones in share/contrib/diffequations/tests/.
andrejv [Tue, 31 Jul 2007 14:18:24 +0000 (31 14:18 +0000)]
Fixed a typo
andrejv [Tue, 31 Jul 2007 11:38:18 +0000 (31 11:38 +0000)]
Updating the graphs package.
hgeyer [Mon, 30 Jul 2007 13:03:48 +0000 (30 13:03 +0000)]
Added the vector3d package of Walter Eastes (eastes@infinet.com) as
share/contrib/vector3d. This closes patch tracker item #974304.
This commit is based on a newer version (than in the patch tracker)
with clarified copyright status. I made some minor changes to
vector3d.usg to make the tone more appropriate with regard to the
current status of the other vector packages in maxima.
robert_dodier [Mon, 30 Jul 2007 04:31:53 +0000 (30 04:31 +0000)]
Change convention for residuals to lhs minus rhs (was rhs minus lhs).
New convention is consistent with definition of error as y = foo(x) + error
which is typical in statistics texts. Code, tests, and documentation all changed.
robert_dodier [Mon, 30 Jul 2007 03:02:37 +0000 (30 03:02 +0000)]
In $VANDERMONDE_MATRIX, throw in an "ignore" declaration to quiet
a warning message generated by SBCL for rtest2.
(This file is autoloaded to get the Hessian function.)
robert_dodier [Mon, 30 Jul 2007 02:57:52 +0000 (30 02:57 +0000)]
Replace previous lsquares (least squares) package.
Features of new version:
(1) Formulate numerical problem as a minimization (solved via lbfgs)
instead of a system of equations (solved via mnewton).
The minimization formulation is more likely to converge
(since there is always a notion of the correct direction, namely downhill)
(2) Separate functions for exact vs numerical estimates
(3) Separate functions to construct the mean square error expression,
residuals, and residual mean square error.
Residual MSE function supersedes the DETCOEF global variable
(4) Test script with many examples. Includes examples from previous
implementation and others
(5) Revised documentation
Files:
* share/contrib/lsquares.mac: replaced implementation
* share/contrib/rtest_lsquares.mac: test script
* doc/info/lsquares.texi: revised documentation
Implementation note: Values obtained for numerical estimates vary
from one Lisp implementation to another. That's disconcerting but
I don't know how to make them all agree. The test script fudges
this point by testing some examples with a greater tolerance.
dgildea [Sun, 29 Jul 2007 16:17:37 +0000 (29 16:17 +0000)]
Fixes for bugs
1741705 and
1748168.
src/defint.lisp
intsc1 no longer requires limits of integration to be multiples of %pi.
uses pretty-good-floor-or-ceiling to find nearest period.
substitutes lower limit into integrand expression only as a last resort, as
substitution tends to cause intsc to miss discontinuities in antiderivative.
tests/rtestint.mac
new test cases from bug reports.
willisbl [Sun, 29 Jul 2007 12:35:34 +0000 (29 12:35 +0000)]
o fixes for subset and partition_set (unreported bugs)
o fix typo in source code comment
andrejv [Fri, 27 Jul 2007 16:54:01 +0000 (27 16:54 +0000)]
Added simpsum:true in two places to adapt to the new sum behaviour.
riotorto [Thu, 26 Jul 2007 14:21:19 +0000 (26 14:21 +0000)]
Style changes and Spanish translation
robert_dodier [Wed, 25 Jul 2007 03:29:01 +0000 (25 03:29 +0000)]
Simplify definite summations to explicit sums (i.e. expressions
with operator = "+") only if the simpsum flag is true.
This restores the behaviour of Maxima previous to the revisions
of December 2005 when it was changed inadvertently in this respect.
robert_dodier [Wed, 25 Jul 2007 03:25:30 +0000 (25 03:25 +0000)]
Add contrib/maxima-server.lisp to list of share files.
riotorto [Tue, 24 Jul 2007 21:46:06 +0000 (24 21:46 +0000)]
* Now, draw always writes two files: maxout.gnuplot (gnuplot
preamble and command) and data.gnuplot (numeric data). In
non windows systems, Maxima calls gnuplot via pipes, but
the only command is now 'load maxima.gnuplot'. I reached
the limits of piping with the new geomap object and this
trick fixes the problem. This change also lets zooming
in windows (I think).
* I have reorganized the documentatiion on draw. You can ask
for information on both graphic options and objects:
? point_type, ? image, ? geomap, etc.
* 2D points: if you give object 'points a list of numbers,
abscissas are automatically set to consecutive positive
integers: points([2,6,2,9]) plots [1,2],[2,6],
[3,2] and [4,9].
* 2D & 3D label: each string, together with its coordinates,
must be enclosed between brackets. Now you can write as many
labels as you want calling 'label only once, as in
label([hi,0,0],[you,1,1]). label(hi,0,0) returns an
error, but label([hi,0,0]) is correct.
* Package 'picture added. This gives basic support for
image processing and reads picture files in xpm format.
This package is (very) unstable and not well suited for
rendering large photos. You can build a picture object from a
matrix or from an xpm file and pass it to 'image, as in
draw2d(image(read_xpm(myfile.xpm),0,0,10,10)).
Package 'picture is automatically loaded with 'draw.
See examples in
http://www.telefonica.net/web2/biomates/maxima/gpdraw/image
* New 2D graphic object geomap for drawing maps. Examples in
http://www.telefonica.net/web2/biomates/maxima/gpdraw/geomap
Notes on geomap:
- Some boundaries and islands are controversial. I tried to
define countries according to the borders recognized by
the United Nations. Please, don't feel offended due to
my mistakes and/or ignorance.
- The WBD doesn't contain borders for Eritrea.
- I have assigned the antarctic islands to the Antarctica
variable.
- The WBD doesn't separate european and asian Russia,
that's why I haven't included Russia as an european
country.
- The WDB contains some lakes not yet included here.
- When drawing countries as coloured polygons, don't forget
that some countries are completely surrounded by other
countries: San_Marino by Italy and Lesotho by South_Africa.
- File share/wdb.lisp contains boundary coordinates as lisp
arrays, and in share/worldmap.map are the country and
continent definitions.
* All the above changes are included in doc/info/draw.texi,
but the Spanish documentation will be commited before
the next release of Maxima, together with some minor changes.
willisbl [Mon, 23 Jul 2007 11:36:04 +0000 (23 11:36 +0000)]
Better functions jacobian and hessian
willisbl [Mon, 23 Jul 2007 11:11:13 +0000 (23 11:11 +0000)]
Faster function vandermonde_matrix
robert_dodier [Mon, 23 Jul 2007 02:07:23 +0000 (23 02:07 +0000)]
Revise with_stdout to accept a stream as well as a filename.
* src/macsys.lisp: revise with_stdout code
* doc/info/Input.texi: revise with_stdout documentation
macrakis [Mon, 23 Jul 2007 01:18:42 +0000 (23 01:18 +0000)]
Correct indentation
vvzhy [Sun, 22 Jul 2007 09:44:40 +0000 (22 09:44 +0000)]
Small corrections
vvzhy [Sun, 22 Jul 2007 07:51:48 +0000 (22 07:51 +0000)]
Initial Russian translation
robert_dodier [Sun, 22 Jul 2007 02:33:33 +0000 (22 02:33 +0000)]
Put new string stream functions (make_string_input_stream, make_string_output_stream,
and get_output_stream_string) on list of autoloading functions in stringproc package.
vttoth [Fri, 20 Jul 2007 22:19:54 +0000 (20 22:19 +0000)]
Update to correctly compute the exterior derivative of tensor-valued forms.
robert_dodier [Fri, 20 Jul 2007 15:02:04 +0000 (20 15:02 +0000)]
New functions make_string_input_stream, make_string_output_stream, and get_output_stream_string
which punt to CL functions of similar names.
This exposes the CL string stream type to the Maxima user level.
robert_dodier [Fri, 20 Jul 2007 14:57:37 +0000 (20 14:57 +0000)]
Change MK:LOAD-SYSTEM to MK:COMPILE-SYSTEM to suppress questions.
rtoy [Thu, 19 Jul 2007 16:36:24 +0000 (19 16:36 +0000)]
Bug [
1690374 ] asin(1 / sqrt(2))
src/trigo.lisp:
o Make maxima recognize asin(1/sqrt(2)) and acos(1/sqrt(2)) are both
%pi/4.
tests/rtest15.mac:
o Add tests for this bug.
willisbl [Thu, 19 Jul 2007 16:24:47 +0000 (19 16:24 +0000)]
villate [Thu, 19 Jul 2007 08:14:40 +0000 (19 08:14 +0000)]
Fixes two bugs: options should not be confused with the definition of
the state variables and the expressions given should be allowed to
depend on more than 2 variables, since they might included known parameters (this change was already present in the 5.12 branch)
dgildea [Thu, 19 Jul 2007 00:10:08 +0000 (19 00:10 +0000)]
sf bug
1490397 - subres gcd wrong
ratsum was ignoring last element of list returned by pgcdcofacts,
which contains denom factor from algebraic gcd. also, move call to
ratreduce to top level of result expression so this factor can cancel.
robert_dodier [Wed, 18 Jul 2007 13:55:22 +0000 (18 13:55 +0000)]
Force evaluation for expected result expressions which need it.
Also one new test case.
robert_dodier [Wed, 18 Jul 2007 13:52:38 +0000 (18 13:52 +0000)]
Work around for tellsimpafter strangeness:
when a ` expression does not match any rule, the arguments are not simplified.
That caused many test cases in rtestezunits to fail, because now the
expected result is only simplified, not evaluated. So throw in a rule for `
which only causes the arguments to be simplified; seems to fix the problem.
robert_dodier [Wed, 18 Jul 2007 13:47:43 +0000 (18 13:47 +0000)]
Change IMEMBER to MEMBER (since IMEMBER was a macro which
simply punted to MEMBER).
dgildea [Wed, 18 Jul 2007 10:24:26 +0000 (18 10:24 +0000)]
fix comparison/simplification probs in cases from last commit
add test case from sf bug
1730044 - powerseries(1+x^n,x,0) wrong
dgildea [Wed, 18 Jul 2007 10:21:28 +0000 (18 10:21 +0000)]
sf bug
1730044 - powerseries(1+x^n,x,0) wrong
code before series.lisp v 1.5 only worked when srbinexpnd called with
noninteger exponent in numerator of expr to expand, or with integer
exponent in denominator. v 1.5 fixed noninteger in denominateor,
this changes fixes intger in numerator: powerseries(1+x^n,x,0).
Always negate exponent in denominator (not just for nonints), negate
again when calling srintegexpd from srbinexpnd.
andrejv [Wed, 18 Jul 2007 09:41:59 +0000 (18 09:41 +0000)]
Fix a typo.
andrejv [Wed, 18 Jul 2007 09:29:49 +0000 (18 09:29 +0000)]
Fix a typo.
andrejv [Wed, 18 Jul 2007 08:15:41 +0000 (18 08:15 +0000)]
Use linearalgebra package instead of linsolve to solve linear systems.
andrejv [Wed, 18 Jul 2007 08:14:39 +0000 (18 08:14 +0000)]
Update to case sensitive maxima.
vttoth [Tue, 17 Jul 2007 21:26:32 +0000 (17 21:26 +0000)]
Fixed a bug in CANTEN caused by the removal of the array macro.
Fixed bugs in CTENSOR caused by changes in how dependencies are evaluated.
Fixed small discrepancies in test outputs.
willisbl [Tue, 17 Jul 2007 20:15:50 +0000 (17 20:15 +0000)]
firx for new complex-number-p
robert_dodier [Tue, 17 Jul 2007 13:47:28 +0000 (17 13:47 +0000)]
In $MATRIX_SIGN, remove unused lexical variable SGN.
robert_dodier [Tue, 17 Jul 2007 13:42:52 +0000 (17 13:42 +0000)]
(1) Implement simplify_units to assume units symbols are positive.
Call simplify_units from the exponent rule (as well as the multiplication rule).
(2) Quote the symbol "dimensional" in functions to quiet complaint
from translation code about "undeclared global variable" (something like that).
robert_dodier [Tue, 17 Jul 2007 13:40:22 +0000 (17 13:40 +0000)]
Reenable Planck law example. Now it runs quickly
since factor is no longer called from generated pattern matching function.
riotorto [Sun, 15 Jul 2007 17:06:56 +0000 (15 17:06 +0000)]
Updating translations
vvzhy [Sun, 15 Jul 2007 14:24:14 +0000 (15 14:24 +0000)]
Translation corrections
vvzhy [Sun, 15 Jul 2007 09:58:19 +0000 (15 09:58 +0000)]
It seems that dispJordan must by applied to the result produced by
jordan not by JF
vvzhy [Sun, 15 Jul 2007 07:37:41 +0000 (15 07:37 +0000)]
Initial Russian translation
vvzhy [Sun, 15 Jul 2007 07:35:10 +0000 (15 07:35 +0000)]
Tipo
vvzhy [Sun, 15 Jul 2007 07:09:58 +0000 (15 07:09 +0000)]
Update to revision 1.50
willisbl [Sat, 14 Jul 2007 19:23:59 +0000 (14 19:23 +0000)]
insert regression tests for SF bug
1754072
willisbl [Sat, 14 Jul 2007 19:08:25 +0000 (14 19:08 +0000)]
riotorto [Fri, 13 Jul 2007 08:51:11 +0000 (13 08:51 +0000)]
Updating translatiions
hgeyer [Wed, 11 Jul 2007 19:17:42 +0000 (11 19:17 +0000)]
assume(meter >= 0) and similiar to get abs(meter) simplify to meter.
The patch originally comes from patch tracker item
1622650 but was
improved a bit to be more complete.
This commit also fixes a few bugs (obviously typos and copy/paste errors)
that where found while testing the patch.
riotorto [Tue, 10 Jul 2007 22:06:45 +0000 (10 22:06 +0000)]
Updating translations
riotorto [Tue, 10 Jul 2007 14:35:41 +0000 (10 14:35 +0000)]
Commiting changes in interpol package,
according to mailing list discussion.
willisbl [Mon, 9 Jul 2007 20:40:05 +0000 (9 20:40 +0000)]
o many improvements to to_poly
o new functions elim and elim_allbut
vvzhy [Sun, 8 Jul 2007 17:43:38 +0000 (8 17:43 +0000)]
Some style changes.
vvzhy [Sun, 8 Jul 2007 15:17:09 +0000 (8 15:17 +0000)]
Initial Russian translation.
vvzhy [Sun, 8 Jul 2007 08:00:43 +0000 (8 08:00 +0000)]
Update for German, Spanish, and Franch translation of Intro and Readme
which includes reference to Data Execution Prevention (DEP) problem.
vvzhy [Sun, 8 Jul 2007 06:19:55 +0000 (8 06:19 +0000)]
Install prologue.ps which is required for .ps files creation by
gnuplot 4.2. Fixes bug #
1732298
robert_dodier [Sat, 7 Jul 2007 23:51:49 +0000 (7 23:51 +0000)]
Extend applicability of powerseries function.
Patch submitted by Dan Gildea via SF bug report #
1722156.
Also include test cases proposed by Dan in the bug report.
At present, the merged code fails some of the test cases,
but this appears to be due to the testing code
("expected" result appears to be simplified differently
than when it was generated, although I do not know for sure).
robert_dodier [Sat, 7 Jul 2007 23:42:41 +0000 (7 23:42 +0000)]
Mention file stream input/output in numericalio documentation.
Some minor rephrasing also.
rtoy [Fri, 6 Jul 2007 17:04:40 +0000 (6 17:04 +0000)]
Fix typo. A lambda function was quoted that should not have been.
andrejv [Thu, 5 Jul 2007 09:55:48 +0000 (5 09:55 +0000)]
Don't print a message when loading the package.
andrejv [Thu, 5 Jul 2007 09:53:33 +0000 (5 09:53 +0000)]
Updating the list of files in share/contrib
andrejv [Thu, 5 Jul 2007 09:48:16 +0000 (5 09:48 +0000)]
Adding the documentation in pdf.
andrejv [Thu, 5 Jul 2007 09:46:12 +0000 (5 09:46 +0000)]
Change the way draw_graph gets the temp filename.
robert_dodier [Thu, 5 Jul 2007 04:13:17 +0000 (5 04:13 +0000)]
Current version of category stuff. Seems to work OK,
despite being a hideous mess. Do not worry; it is not integrated into the build process.
robert_dodier [Wed, 4 Jul 2007 16:53:38 +0000 (4 16:53 +0000)]
Various revisions to quiet texi2html warnings and attempt to improve appearance of output.
Some sed and awk stuff has been split out of extract_categories.sh
into extract_categories1.sed and extract_categories1.awk.
New file category-macros.texi contains Texinfo macros.
andrejv [Wed, 4 Jul 2007 11:30:16 +0000 (4 11:30 +0000)]
Changing sx suffixes to lp.
robert_dodier [Wed, 4 Jul 2007 02:37:04 +0000 (4 02:37 +0000)]
New code to implement equivalence tests (i.e. special cases in MEQP,
the function eventually called by is(equal(...))) for Maxima arrays.
* src/compar.lisp:
(1) New functions MAXIMA-DECLARED-ARRAYP, MAXIMA-UNDECLARED-ARRAYP
(2) New special cases in MEQP for objects which satisfy
MAXIMA-DECLARED-ARRAYP and MAXIMA-UNDECLARED-ARRAYP
(3) New functions MAXIMA-DECLARED-ARRAY-MEQP and MAXIMA-UNDECLARED-ARRAY-MEQP
which are called from MEQP
(3) Incidentally, rephrase tests in MEQP for strings and Lisp arrays
(logic was strange before, not sure what I was thinking there)
(4) Incidentally, bind $RATPRINT to NIL in array element comparison
(messages about float-to-rational conversion are superfluous in this context)
* src/simp.lisp:
(1) Rename ARRAY-ALIKE1 to more specific LISP-ARRAY-ALIKE1
(2) Special cases in ALIKE1 (but commented out) for Maxima arrays;
not sure if we want to enable is(a = b) comparison of Maxima
arrays, so just preserve the code until someone decides it is
too ugly to tolerate any longer.
(3) New functions MAXIMA-DECLARED-ARRAY-ALIKE1, MAXIMA-UNDECLARED-ARRAY-ALIKE1
(not called from anywhere; calls in ALIKE1 are commented out)
* share/contrib/numericalio/rtest_numericalio.mac:
Make use of Maxima array comparisons in test script
* tests/rtest_equal.mac:
New tests for equivalence of Maxima arrays
* tests/testsuite.lisp:
Mark two tests in rtest_equal as known failures
(comparison of array functions and subscripted functions is
not handled correctly by Maxima array comparison code at present)
robert_dodier [Wed, 4 Jul 2007 02:31:31 +0000 (4 02:31 +0000)]
Adjust the comment which is printed at the top of foo.ERR
by batch("foo.mac", test).
robert_dodier [Tue, 3 Jul 2007 05:19:27 +0000 (3 05:19 +0000)]
Script to generate a "Categories" section and @anchor and @ref
as indicated by @category macros to collect items into categories,
with links back from the categories to the items.
This script works OK, but it is a mess and it needs more work.
I am committing it now just to make sure it does not get lost.
It is not called from the Makefile so it has no effect at present.
willisbl [Mon, 2 Jul 2007 11:43:21 +0000 (2 11:43 +0000)]
fixing bugs in matrix_sign
robert_dodier [Sun, 1 Jul 2007 19:30:37 +0000 (1 19:30 +0000)]
Define $OUTERMAP and $APPLY via DEFUN instead of DEFMSPEC.
This makes Maxima functions outermap and apply evaluate their arguments
in the same manner as most built-in Maxima functions.
Some discussion on mailing list circa June 2007.
robert_dodier [Sun, 1 Jul 2007 19:18:11 +0000 (1 19:18 +0000)]
New function $UNIQUE to return unique elements of a list.
Some discussion of this on mailing list circa June 2007.
robert_dodier [Sun, 1 Jul 2007 19:14:31 +0000 (1 19:14 +0000)]
Call $LOAD instead of $BATCHLOAD in GENERIC-AUTOLOAD.
$LOAD searches the Lisp paths and Maxima paths, while $BATCHLOAD
searches only the Maxima paths.
robert_dodier [Sun, 1 Jul 2007 19:12:48 +0000 (1 19:12 +0000)]
Cut out AUTOF2 function and assign AUTOLOAD property instead of
calling AUTOF2, which did not work as intended: AUTOF2-declared functions
caused the associated file to be loaded repeatedly.
robert_dodier [Sun, 1 Jul 2007 19:04:13 +0000 (1 19:04 +0000)]
In L-STRING, if argument is already a Lisp string, return it unmodified.
In M-STRING, if argument is already a Maxima string, return it unmodified.
robert_dodier [Sun, 1 Jul 2007 19:02:15 +0000 (1 19:02 +0000)]
Make floats easier to parse by using values which have exact
IEEE 754 representations. This makes rtest_numericalio succeed for GCL,
which parses equivalent floats (e.g. 12.3456d0 and 123.456d-1) into different numbers.
That is a bug in GCL; changes to numericalio data are just a workaround.
vvzhy [Sun, 1 Jul 2007 18:58:21 +0000 (1 18:58 +0000)]
Update to original revision 1.24
vvzhy [Sun, 1 Jul 2007 15:46:34 +0000 (1 15:46 +0000)]
Update to original release 1.29
vvzhy [Sun, 1 Jul 2007 15:45:40 +0000 (1 15:45 +0000)]
Some more @code -> @var replacements