branch: externals/greader commit 0be62cf9d8acc57126f5e2e7a441e7ca22e29513 Author: Michelangelo Rodriguez <michelangelo.rodrig...@gmail.com> Commit: Michelangelo Rodriguez <michelangelo.rodrig...@gmail.com>
greader version 0.11.11 Minor fixes. --- LICENSE | 1266 +++++++++++++++++++++++++++----------------------- greader-audiobook.el | 4 +- greader-dict.el | 2 +- greader-espeak.el | 14 + greader-mac.el | 18 +- greader-translate.el | 2 +- greader.el | 8 +- 7 files changed, 712 insertions(+), 602 deletions(-) diff --git a/LICENSE b/LICENSE index 55924157e9..f288702d2f 100644 --- a/LICENSE +++ b/LICENSE @@ -1,592 +1,674 @@ -Copyright (C) 2007-2024 Free Software Foundation, Inc. -See the end of the file for license conditions. - - -NOTES ON COPYRIGHTS AND LICENSES - -Some terminology: - -A "copyright notice" consists of one or a few lines of this format: -"Copyright (C) 2006, 2007 Free Software Foundation, Inc." - -A "license notice" is a statement of permissions, and is usually much -longer, eg the text "GNU Emacs is free software...". - - -Summary for the impatient: - -1. Don't add code to Emacs written by someone other than yourself -without thinking about the legal aspect. Even if the changes are -trivial, consider if they combine with previous changes by the same -author to make a non-trivial total. If so, make sure they have an -assignment. If adding a whole file adjust the copyright statements in -the file. - -2. When installing code written by someone else, the commit -should be in the name of the author of the code, not the person who -installs it. Also use commit's "--author" option. -Do not install any of your own changes in the same commit. - -3. With images, add the legal info to a README file in the directory -containing the image. - -4. If you add a lot of text to a previously trivial file that had no -legal notices, consider if you should add a copyright statement. - -5. Please don't just add an FSF copyright without checking that is the -right thing to do. - - -Every non-trivial file distributed through the Emacs repository should be -self-explanatory in terms of copyright and license. This includes -files that are not distributed in Emacs releases (for example, the -admin/ directory), because the whole Emacs repository is publicly -available. - -The definition of triviality is a little vague, but a rule of thumb is -that any file with less than 15 lines of actual content is trivial. If -a file is auto-generated (eg ldefs-boot.el) from another one in the -repository, then it does not really matter about adding a copyright -statement to the generated file. - -Legal advice says that we could, if we wished, put a license notice -even in trivial files, because copyright law in general looks at the -overall work as a whole. It is not _necessary_ to do so, and rms -prefers that we do not. This means one needs to take care that trivial -files do not grow and become non-trivial without having a license -added. NB consequently, if you add a lot of text to a small file, -consider whether your changes have made the file worthy of a copyright -notice, and if so, please add one. - -It can be helpful to put a reminder comment at the start of a trivial -file, eg: "add a license notice if this grows to > 10 lines of code". - -The years in the copyright notice should be updated every year (see -file "years" in this directory). The PDF versions of refcards etc -should display copyright notices (an exception to the rule about -"generated" files), but these can just display the latest year. The -full list of years should be kept in comments in the source file. If -these are distributed in the repository, check in a regenerated -version when the tex files are updated. - -Copyright changes should be propagated to any associated repositories -(eg Gnus, MH-E), but I think in every case this happens automatically -(?). - -All README (and other such text files) that are non-trivial should -contain copyright statements and GPL license notices, exactly as .el -files do (see e.g. README in the top-level directory). Before 2007, -we used a simple, short statement permitting copying and modification -provided legal notices were retained. In Feb 2007 we switched to the -standard GPL text, on legal advice. Some older text files in etc/ -should, however, keep their current licenses (see below for list). - -For image files, the copyright and license details should be recorded -in a README file in each directory with images. (Legal advice says -that we need not add notices to each image file individually, if they -allow for that.). It is recommended to use the word "convert" to -describe the automatic process of changing an image from one format to -another (https://lists.gnu.org/r/emacs-devel/2007-02/msg00618.html). - - -When installing a file with an "unusual" license (after checking first -it is ok), put a copy of the copyright and license in the file (if -possible. It's ok if this makes the file incompatible with its -original format, if it can still be used by Emacs), or in a README -file in the relevant directory. - -The vast majority of files are copyright FSF and distributed under the -GPL. A few files (mainly related to language and charset support) are -copyright AIST alone, or both AIST and FSF. (Contact Kenichi Handa -with questions about legal issues in such files.) In all these cases, -the copyright years in each file should be updated each year. - -There are some exceptions to the points in the previous paragraph, and -these are listed below for reference, together with any files where -the copyright needs to be updated in "unusual" ways. - -If you find any other such cases, please consult to check they are ok, -and note them in this file. This includes missing copyright notices, -and "odd" copyright holders. In most cases, individual authors should -not appear in copyright statements. Either the copyright has been -assigned (check copyright.list) to the FSF (in which case the original -author should be removed and the year(s) transferred to the FSF); or -else it is possible the file should not be in Emacs at all (please -report!). - -Note that it seems painfully clear that one cannot rely on commit logs, -or even change log entries, for older changes. People often installed -changes from others, without recording the true authorship. - -[For reference, most of these points were established via email with -rms, 2007/1, "Copyright years". - -In March 2011, information on some files no longer included was removed. -Consult older versions of this document if interested.] - - -lisp/version.el # emacs-copyright -lib-src/ebrowse.c # version -lib-src/etags.c # print_version -lib-src/rcs2log # Copyright -Cocoa/Emacs.base/Contents/Info.plist -Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings -GNUstep/Emacs.base/Resources/Info-gnustep.plist - 'set-copyright' in admin.el will do all the above. - -aclocal.m4 -configure -m4/*.m4 - - These files are copyright FSF, with unlimited permission to copy, - distribute and modify, so long as the copyright notice is preserved. - Exception: m4/pkg.m4 is copyright Scott James Remnant; it is - distributed under the same terms as for the rest of Emacs. - -lib/Makefile.in - - copyright FSF, with MIT-like license - -build-aux/install-sh - - this file is copyright MIT, which is OK. Leave the copyright alone. - -etc/refcards/*.tex - also update the \def\year macro for the latest year. - -etc/future-bug - - doesn't need a humorless disclaimer, because Karl Fogel says we - can consider it part of Emacs, and he has a blanker disclaimer for - Emacs changes. (email to rgm "[Emacs-commit] emacs/etc future-bug", - 2007028) - -etc/letter.pbm,letter.xpm - - trivial, no notice needed. -<https://lists.gnu.org/r/emacs-devel/2007-02/msg00324.html> - -etc/HELLO - standard notices. Just a note that although the file itself is not - really copyrightable, in the wider context of it being part of - Emacs (and written by those with assignments), a standard notice is - fine. - -etc/MAILINGLISTS - rms: simple license is fine for this file - -leim/CXTERM-DIC/4Corner.tit, ARRAY30.tit, CCDOSPY.tit, ECDICT.tit, -ETZY.tit, PY-b5.tit, Punct-b5.tit, Punct.tit, QJ-b5.tit, QJ.tit, -SW.tit, TONEPY.tit, ZOZY.tit - - leave the copyrights alone. - -leim/MISC-DIC/CTLau-b5.html, CTLau.html, cangjie-table.b5, cangjie-table.cns, -pinyin.map, ziranma.cin - - leave the copyright alone. -Note that pinyin.map, ziranma.cin (and hence the generated -leim/quail/PY.el, ZIRANMA.el) are under GPLv1 or later. - -leim/SKK-DIC/SKK-JISYO.L -ja-dic/ja-dic.el - (the latter is auto-generated from the former). Leave the copyright alone. - -lib-src/etags.c - Copyright information is duplicated in etc/ETAGS.README. Update that - file too. - - Until 2007 etags.c was described as being copyright FSF and Ken Arnold. - After some investigation in Feb 2007, then to the best of our - knowledge we believe that the original 1984 Emacs version was based - on the version in BSD4.2. See for example this 1985 post from Ken Arnold: - <https://groups.google.com/group/mod.sources/browse_thread/thread/ffe5c55845a640a9> - I have received enough requests for the current source to ctags - to post it. Here is the latest version (what will go out with - 4.3, modulo any bugs fixed during the beta period). It is the - 4.2 ctags with recognition of yacc and lex tags added. - - See also a 1984 version of ctags (no copyright) posted to net.sources: - <https://groups.google.com/group/net.sources/msg/a21b6c21be12a98d> - Version of etags.c in emacs-16.56 duplicates comment typos. - - Accordingly, in Feb 2007 we added a 1984 copyright for the - University of California and a revised BSD license. The terms of - this require that the full license details be available in binary - distributions - hence the file etc/ETAGS.README. The fact that the - --version output just says "Copyright <year> FSF" is apparently OK - from a legal point of view. - -lisp/cedet/semantic/imenu.el - - See https://lists.gnu.org/r/emacs-devel/2010-03/msg00410.html - in which Eric Ludlam established that the remaining contributions - from authors other than himself were negligible. - -lisp/play/tetris.el - - no special rules about the copyright. We note here that we believe - (2007/1) there is no problem with our use of the name "tetris" or - the concept. - rms: "My understanding is that game rules as such are not copyrightable." - <https://lists.gnu.org/r/emacs-devel/2007-01/msg00960.html> - rms: Legal advice is that we are ok and need not worry about this. - - -lisp/net/tramp.el - - there are also copyrights in the body of the file. Update these too. - - -lwlib/ -rms (2007/02/17): "lwlib is not assigned to the FSF; we don't consider -it part of Emacs. [...] Therefore non-FSF copyrights are ok in lwlib." - -NB don't change the GPL version used for lwlib .c and .h files (see -below). - -FSF copyrights should only appear in files which have undergone -non-trivial cumulative changes from the original versions in the Lucid -Widget Library. NB this means that if you make non-trivial changes to -a file with no FSF copyright, you should add one. Also, if changes are -reverted to the extent that a file becomes basically the same as the -original version, the FSF copyright should be removed. - -In my (rgm) opinion, as of Feb 2007, all the non-trivial files differ -significantly from the original versions, with the exception of -lwlib-Xm.h. Most of the changes that were made to this file have -subsequently been reverted. Therefore I removed the FSF copyright from -this file (which is arguably too trivial to merit a notice anyway). I -added FSF copyright to the following files which did not have them -already: Makefile.in, lwlib-Xaw.c, lwlib-int.h (borderline), -lwlib-utils.c (borderline), lwlib.c, lwlib.h. - -Copyright years before the advent of public CVS in 2001 were those -when I judged (from the CVS logs) that non-trivial amounts of change -had taken place. I also adjusted the existing FSF years in xlwmenu.c, -xlwmenu.h, and xlwmenuP.h on the same basis. - -Note that until Feb 2007, the following files in lwlib were lacking -notices: lwlib-int.h, lwlib.h, lwlib-Xaw.h, lwlib-Xlw.h, lwlib-utils.h - -The following files did not list a Lucid copyright: xlwmenu.h, -xlwmenuP.h. - -To the best of our knowledge, all the code files in lwlib were -originally part of the Lucid Widget Library, even if they did not say -so explicitly. For example, they were all present in Lucid Emacs 19.1 -in 1992. The exceptions are the two Xaw files, which did not appear -till Lucid Emacs 19.9 in 1994. The file lwlib-Xaw.h is too trivial to -merit a copyright notice, but would presumably have the same one as -lwlib-Xaw.c. We have been unable to find a true standalone version of -LWL, if there was such a thing, to check definitively. - -To clarify the situation, in Feb 2007 we added Lucid copyrights and -GPL notices to those files lacking either that were non-trivial, -namely: lwlib-int.h, lwlib.h, xlwmenu.h, xlwmenuP.h. This represents -our best understanding of the legal status of these files. We also -clarified the notices in Makefile.in, which was originally the -Makefile auto-generated from Lucid's Imakefile. - -As of Feb 2007, the following files are considered too trivial for -notices: lwlib-Xaw.h, lwlib-Xlw.h, lwlib-utils.h. - -The version of lwlib/ first installed in Emacs seems to be the same as -that used in Lucid Emacs 19.8 (released 6-sep-93); except the two Xaw -files, which did not appear till Athena support was added in Lucid -Emacs 19.9. In Lucid Emacs 19.1, all files were under GPLv1 or later, -but by Lucid Emacs 19.8, lwlib.c and xlwmenu.c had been switched to v2 -or later. These are the versions that were first installed in Emacs. -So in GNU Emacs, these two files have been under v2 or later since -1994. - -It seems that it was the intention of Lucid to use v1 or later -(excepting the two files mentioned previously); so this is the license -we have used when adding notices to code that did not have notices -originally. Although we have the legal right to switch to v2 or later, -rms prefers that we do not do so. - - -doc/*/doclicense.texi - - leave the copyright alone in this imported file. - -doc/*/*.texi - All manuals should be under GFDL (but see below), and -should include a copy of it, so that they can be distributed -separately. faq.texi has a different license, for some reason no-one -can remember. -https://lists.gnu.org/r/emacs-devel/2007-04/msg00583.html -https://lists.gnu.org/r/emacs-devel/2007-04/msg00618.html - -doc/misc/mh-e.texi is dual-licensed (GPL and GFDL) per agreement with -FSF (reconfirmed by rms Aug 25 2008). Discussion with -licens...@fsf.org starting on Thu, 07 Aug 2003 with subject: -"[gnu.org #58812] Changing license of MH-E manual" - - -msdos/sed*.inp - These files are copyright FSF and distributed under -an MIT-like license. - - -oldXMenu/ - Keep the "copyright.h" method used by X11, rather than moving the - licenses into the files. Note that the original X10.h did not use - copyright.h, but had an explicit notice, which we retain. - -If you make non-trivial changes to a file which does not have an FSF -notice, add one and a GPL notice (as per Activate.c). If changes to a -file are reverted such that it becomes essentially the same as the -original X11 version, remove the FSF notice and GPL. - -Only the files which differ significantly from the original X11 -versions should have FSF copyright and GPL notices. At time of writing -(Feb 2007), this is: Activate.c, Create.c, Internal.c. I (rgm) -established this by diff'ing the current files against those in X11R1, -and when I found significant differences looking in the ChangeLog for -the years they originated (the CVS logs are truncated before 1999). I -therefore removed the FSF notices (added in 200x) from the other -files. There are some borderline cases IMO: AddSel.c, InsSel.c, -XMakeAssoc.c, XMenu.h. For these I erred on the side of NOT adding FSF -notices. - -With regards to whether the files we have changed should have GPL -added or not, rms says (2007-02-25, "oldXmenu issues"): - - It does not make much difference, because oldXmenu is obsolete - except for use in Emacs (and it is not normally used in Emacs any - more either). - - So, to make things simple, please put our changes under the GPL. - -insque.c had no copyright notice until 2005. The version of insque.c -added to Emacs 1992-01-27 is essentially the same as insremque.c added -to glic three days later by Roland McGrath, with an FSF copyright and -GPL, but no ChangeLog entry. -To the best of his recollection, McGrath (who has a copyright -assignment) was the author of this file (email from roland at frob.com -to rms, 2007-02-23, "Where did insque.c come from?"). The FSF -copyright and GPL in this file are therefore correct as far as we -understand it. - -Imakefile had no legal info in Feb 2007, but was obviously based on -the X11 version (which also had no explicit legal info). As it was -unused, I removed it. It would have the same MIT copyright as -Makefile.in does now. - - -src/gmalloc.c - - contains numerous copyrights from the GNU C library. Leave them alone. - -nt/inc/dirent.h - - see comments below. This file is OK to be released with Emacs - 22, but we may want to revisit it afterwards. - - -** Some notes on resolved issues, for historical information only - -etc/TERMS -rms: "surely written either by me or by ESR. (If you can figure out -which year, I can probably tell you which.) Either way, we have papers -for it." It was present in Emacs-16.56 (15-jul-85). rms: "Then I -conclude it was written by me." - -lisp/term/README - - had no copyright notice till Feb 2007. ChangeLog.3 suggests it was - written by Eric S. Raymond. When asked by rms on 14 Feb 2007 he said: - - I don't remember writing it, but it reads like my prose and I believe - I wrote the feature(s) it's describing. So I would have been the - likeliest person to write it. - - Odds are that I did, but I'm not certain. - - Accordingly, FSF copyright was added. - -src/unexhp9k800.c - https://lists.gnu.org/r/emacs-devel/2007-02/msg00138.html - - briefly removed due to legal uncertainly Jan-Mar 2007. The - relevant assignment is under "hp9k800" in copyright.list. File was - written by John V. Morris at HP, and disclaimed by the author and - HP. So this file is public domain. - - -lisp/progmodes/python.el -Dave Love alerted us to a potential legal problem: -https://lists.gnu.org/r/emacs-pretest-bug/2007-04/msg00459.html - -On consultation with a lawyer, we found there was no problem: -https://lists.gnu.org/r/emacs-devel/2007-05/msg00466.html - - -** Issues that are "fixed" for the release of Emacs 22, but we may - wish to revisit later in more detail - - -admin/check-doc-strings - File says it's in the public domain, but that might not make it so. - -etc/e/eterm-color.ti -nt/inc/dirent.h - On legal advice from Matt Norwood, the following comment was added - to these files in Feb/Mar 2007: - - The code here is forced by the interface, and is not subject to - copyright, constituting the only possible expression of the - algorithm in this format. - - With the addition of this notice, these files are OK for the - upcoming Emacs-22 release. Post-release, we can revisit this issue - and possibly add a list of all authors who have changed these files. - (details in email from Matt Norwood to rms, 2007/02/03). - -src/s/aix3-2.h, hpux8.h, hpux9.h, irix5-0.h, netbsd.h, usg5-4-2.h - [note some of these have since been merged into other files] - - all these (not obviously trivial) files were missing copyrights - till Feb 2007, when FSF copyright was added. Matt Norwood advised: - - For now, I think the best policy is to assume that we do have - assignments from the authors (I recall many of these header files - as having been originally written by rms), and to attach an FSF - copyright with GPL notice. We can amend this if and when we - complete the code audit. Any additions to these files by - non-assigned authors are arguably "de minimis" contributions to - Emacs: small changes or suggestions to a work that are subsumed in - the main authors' copyright in the entire work. - -Here is my (rgm) take on the details of the above files: - -? irix5-0.h - I would say started non-trivial (1993, jimb, heavily based - on irix4-0.h). A few borderline non-tiny changes since. - -usg5-4-2.h - started non-trivial, but was heavily based on usg5-4.h, which was and is - copyright FSF. only tiny changes since installed. - -aix3-2.h, hpux8.h, hpux9.h, netbsd.h - started trivial, grown in tiny changes. - -netbsd.h: -Roland McGrath said to rms (2007/02/17): "I don't really remember -anything about it. If I put it in without other comment, then probably -I wrote it myself." - - -Someone might want to tweak the copyright years (for dates before -2001) that I used in all these files. - -Note: erring on the side of caution, I also added notices to some -files I thought might be considered non-trivial (if one includes -comment) in s/: - aix4-1.h hpux10.h irix6-5.h - sol2.h - -(everything with > 30 non-blank lines, which at least is _some_ kind of -system) - - -*** These are copyright issues that need not be fixed until after - Emacs 22 is released (though if they can be fixed before, that is - obviously good): - - -Is it OK to just remove a file for legal reasons, or is something more -drastic (excision from the entire repository history) needed? A -removed file is still available from the repository, if suitable -options are applied. (This issue obviously does not affect a release). - rms: will ask lawyer - - -Make sure that all files with non-standard copyrights or licenses are -noted in this file. - - -REMOVED etc/gnu.xpm, nt/icons/emacs21.ico, nt/icons/sink.ico - - Restore if find legal info. emacs21.ico is not due to Davenport. - Geoff Voelker checked but could not find a record of where it came - from. - - -etc/images - Image files from GTK, Gnome are under GPLv2 (no "or later"?). RMS will - contact image authors in regards to future switch to v3. - - -etc/TUTORIAL* (translations) - switch to GPL (see english TUTORIAL) - rms: "We can leave the TUTORIAL translations alone until their - maintainers update them." - Can adapt short license text from end of GPL translations at: - https://www.gnu.org/licenses/translations.html - Only a few sentences around the license notice need changing from - previous version. -Done: TUTORIAL.eo - - -*** These are copyright issues still to be addressed: - -None known. - - -** NOTES ON RELICENSING TO GPL3 - -The EMACS_22_BASE branch was changed to GPLv3 (or later) 2007/07/25. - -Some notes: -(see https://lists.gnu.org/r/emacs-devel/2007-07/msg01431.html) - -1. There are some files in the Emacs tree which are not part of Emacs (eg -those included from Gnulib). These are all copyright FSF and (at time -of writing) GPL >= 2. rms says may as well leave the licenses of these -alone (may import them from Gnulib again). These are: - - Gnulib: - build-aux/config.guess - build-aux/config.sub - build-aux/move-if-change - doc/man/texinfo.tex - lib/*.[ch] - lib/gnulib.mk.in - src/gmalloc.c - src/termcap.c - src/tparam.c - -Note _not_ included in the above are src/regex.{c,h} (rms: "That -forked version is only in Emacs, so definitely relicense that."), and -oldXMenu/insque.c (rms: "We wrote that specifically for Emacs, so -definitely relicense that."). - -2. The files that are copyright FSF and AIST, or AIST alone, should be -and were updated, ditto the oldXMenu files with FSF copyright. - -3. lwlib/ - -Files originally in Lucid Widget Library were left alone (excludes -ChangeLog, etc), ie remain under GPL v1 or later, or v2 or later. -(rms: "We may as well leave this alone, since we are never going to -change it much.") - -4. There are some files where the FSF holds no copyright. These were -left alone: - - leim/MISC-DIC/CTLau-b5.html >= v2 - leim/MISC-DIC/CTLau.html >= v2 - (above included in lisp/international/titdic-cnv.el) - leim/MISC-DIC/pinyin.map >= v1 - leim/MISC-DIC/ziranma.cin >= v1 - leim/SKK-DIC/SKK-JISYO.L >= v2 - leim/SKK-DIC/README >= v2 - leim/ja-dic/ja-dic.el >= v2 - -5. At time of writing, some non-Emacs icons included from Gnome remain -under GPLv2 (no "or later"). See: - - etc/images/gnus/README - etc/images/mail/README - etc/images/README - nt/icons/README - - -This file is part of GNU Emacs. - -GNU Emacs is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -GNU Emacs is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + <program> Copyright (C) <year> <name of author> + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +<https://www.gnu.org/licenses/>. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +<https://www.gnu.org/licenses/why-not-lgpl.html>. diff --git a/greader-audiobook.el b/greader-audiobook.el index 984e08996c..cbbe399391 100644 --- a/greader-audiobook.el +++ b/greader-audiobook.el @@ -274,7 +274,7 @@ You have certain control of how this happens by configuring "." greader-audiobook-transcode-format)))) (result nil)) - (setq result (apply 'call-process "ffmpeg" nil "*ffmpeg-output*" + (setq result (apply #'call-process "ffmpeg" nil "*ffmpeg-output*" nil ffmpeg-args)) (unless (eq result 0) (error "Error while transcoding, see buffer `*ffmpeg-output*'")))) @@ -304,7 +304,7 @@ COUNTER represents the current file name." ".zip")) (list book-directory))) (result nil)) - (setq result (apply 'call-process "zip" nil "*audiobook-zip*" nil + (setq result (apply #'call-process "zip" nil "*audiobook-zip*" nil zip-args)) (unless (eq result 0) (error "Error while compressing, see buffer *audiobook-zip* for diff --git a/greader-dict.el b/greader-dict.el index 75c99ae175..0c9e256011 100644 --- a/greader-dict.el +++ b/greader-dict.el @@ -501,7 +501,7 @@ Return nil if KEY is not present in `greader-dictionary'." greader-dict--current-reading-buffer)) (maphash (lambda (k v) - (insert (concat "\"" k "\"" "=" v "\n"))) + (insert "\"" k "\"" "=" v "\n")) greader-dictionary) (write-region (point-min) (point-max) (greader-dict--get-file-name))) diff --git a/greader-espeak.el b/greader-espeak.el index b9519f77b6..9f0a975471 100644 --- a/greader-espeak.el +++ b/greader-espeak.el @@ -1,6 +1,20 @@ ;;; greader-espeak.el --- greader back-end for espeak. -*- lexical-binding: t; -*- ;; Copyright (C) 2017-2024 Free Software Foundation, Inc. +;; This program is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. + +;; This program is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with this program. If not, see +;; <http://www.gnu.org/licenses/>. + ;;; commentary: ;;; code: diff --git a/greader-mac.el b/greader-mac.el index aa71d669a4..870ed2fa3b 100644 --- a/greader-mac.el +++ b/greader-mac.el @@ -1,8 +1,22 @@ ;;; greader-mac.el --- a back-end for Mac-Os tts. -*- lexical-binding: t; -*- ;; Copyright (C) 2017-2024 Free Software Foundation, Inc. -;;; Code: +;; This program is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. + +;; This program is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. +;; You should have received a copy of the GNU General Public License +;; along with this program. If not, see +;; <http://www.gnu.org/licenses/>. + +;;; Code: +(require 'subr-x) (defgroup greader-mac nil "Back-end of mac for greader." @@ -61,7 +75,7 @@ COMMAND must be a string suitable for `make-process'." ('lang (greader-mac-set-voice arg)) ('set-voice - (call-interactively 'greader-mac-set-voice)) + (call-interactively #'greader-mac-set-voice)) ('rate (cond ((equal arg 'value) diff --git a/greader-translate.el b/greader-translate.el index d4faf025ea..ee24c6a97a 100644 --- a/greader-translate.el +++ b/greader-translate.el @@ -94,7 +94,7 @@ case of error." ;;;###autoload (define-minor-mode greader-translate-mode nil - :lighter "gr-transl" + :lighter "gr-transl " (if greader-translate-mode (progn (add-hook 'greader-after-get-sentence-functions diff --git a/greader.el b/greader.el index 6cd2f9d91b..e68fb9f402 100644 --- a/greader.el +++ b/greader.el @@ -7,7 +7,7 @@ ;; Keywords: tools, accessibility ;; URL: https://gitlab.com/michelangelo-rodriguez/greader -;; Version: 0.11.10 +;; Version: 0.11.11 ;; This program is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by @@ -1224,10 +1224,10 @@ When called from a function, you should specify SRC and DST, even if (unless src (setq src (thing-at-point 'word t)) (unless src - (setq src (read-string "Word to add:")))) + (setq src (read-string "Word to add: ")))) (when (listp src) - (setq src (read-string "word to add:")) + (setq src (read-string "word to add: ")) (if (equal src "") (setq src (thing-at-point 'word t)))) (unless dst @@ -1242,7 +1242,7 @@ When called from a function, you should specify SRC and DST, even if greader-compile-default-source)))) (with-current-buffer (find-file-noselect lang-file) (goto-char (point-max)) - (insert (concat src " " dst "\n")) + (insert src " " dst "\n") (save-buffer) (unless greader-compile-mode (greader-compile)))))