Diff being reverted:
diff --git a/ref/software_guidelines.mdwn b/ref/software_guidelines.mdwn index 8e6b8f3..2c7e86b 100644 --- a/ref/software_guidelines.mdwn +++ b/ref/software_guidelines.mdwn @@ -105,17 +105,19 @@ misrepresented as the original IPOL version. A published software **must** be packaged as a compressed archive file. This file archive can either be a single volume .ZIP compressed -archive or a GZIP compressed tar archive[^tar]. In the remainder -of this document, we will use the terms "zip archive" and "tar/gzip -archive" for convenience. - -[^tar]: These file formats are defined by [the PKZIP APPNOTE +archive or a GZIP compressed tar archive. +(These file formats are defined by [the PKZIP APPNOTE specification](http://www.pkware.com/documents/casestudies/APPNOTE.TXT), version 6.3.2, for the .ZIP compressed archive format, [the IETF RFC1952](http://tools.ietf.org/html/rfc1952) for the GZIP compressed format, and [the POSIX.1 ustar definition](http://pubs.opengroup.org/onlinepubs/9699919799/utilities/pax.html#tag_20_92_13_06) - for the tar archive format. + for the tar archive format.) + +In the remainder +of this document, we will use the terms "zip archive" and "tar/gzip +archive" for convenience. + Annex B of this document provides some examples of programs that can be used to produce such compressed archives. @@ -178,12 +180,11 @@ build one or more executable program files implementing the algorithm published in the journal. This material **must** be provided in human-readable source code form. A published software **must not** be distributed with binary precompiled files if these files can be -obtained from source code[^bin]. - -[^bin]: If the authors want to distribute binary versions, they can do it +obtained from source code. +(If the authors want to distribute binary versions, they can do it in the journal as supplementary material but not via the compressed archive of the published software covered by these - guidelines. + guidelines.) Annex C provides some information for the authors to help them perform some frequent implementation tasks. @@ -238,7 +239,8 @@ installed and configured during the compilation and execution: - [`libgsl`](http://www.gnu.org/software/gsl/) version 1.14+ for mathematical routines. - [`libeigen`](http://eigen.tuxfamily.org/) version 3.x for linear - algebra[^eigen]. + algebra. (Only the "official" Eigen modules are allowed, no code form + the "unsupported" experimental section.) - [`cblas`](http://www.netlib.org/blas/) and [`clapack`](http://www.netlib.org/lapack/) for linear algebra. @@ -250,8 +252,6 @@ published software but not distributed in source form with the program. Other libraries can be used if provided with the published software, as detailed in the next section. -[^eigen]: Only the "official" Eigen modules are allowed, no code form - the "unsupported" experimental section. ### 2.5. Support Code @@ -367,14 +367,12 @@ chosen by the previous authors **must not** be modified. - When a source code file can be linked to a patented algorithm and the authors of the source code are the patent inventors, the file **must** be distributed either under the BSD license, the CC0 - dedication or "for research and education only"[^pat]. - - -[^pat]: Distribution "for research and education" can help avoid conflicts + dedication or "for research and education only". +(Distribution "for research and education" can help avoid conflicts between patent rights and software license when the patent inventors are the source code authors. It is not needed in other situations because the validity of the license will depend on the local patent - regulations, as stated in the last sentence of the patent warning. + regulations, as stated in the last sentence of the patent warning.) These wordings are **recommended**: