diff --git a/gradint-build/Makefile b/gradint-build/Makefile index 5f7b8d4ac0d8c01e052271a8f63533bbdf147485..842d10a428288d8512a48313a0af05b149302798 100644 --- a/gradint-build/Makefile +++ b/gradint-build/Makefile @@ -1,5 +1,5 @@ # This file is part of the source code of -# gradint v0.994 (c) 2002-2009 Silas S. Brown. GPL v3+. +# gradint v0.9941 (c) 2002-2009 Silas S. Brown. GPL v3+. # 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 diff --git a/gradint-build/src/booktime.py b/gradint-build/src/booktime.py index 6c7721ece373452e7262e54f7f0ae3d71b40047a..099f508a9cf1a20d4814a145ddf0ded0c4ae29ae 100644 --- a/gradint-build/src/booktime.py +++ b/gradint-build/src/booktime.py @@ -1,5 +1,5 @@ # This file is part of the source code of -# gradint v0.994 (c) 2002-2009 Silas S. Brown. GPL v3+. +# gradint v0.9941 (c) 2002-2009 Silas S. Brown. GPL v3+. # 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 diff --git a/gradint-build/src/filescan.py b/gradint-build/src/filescan.py index 72bfac58a488e71061f73bcd187a9f0655f759ac..a3bcda0c918978142bbd9b64bcbfe528fac10d30 100644 --- a/gradint-build/src/filescan.py +++ b/gradint-build/src/filescan.py @@ -1,5 +1,5 @@ # This file is part of the source code of -# gradint v0.994 (c) 2002-2009 Silas S. Brown. GPL v3+. +# gradint v0.9941 (c) 2002-2009 Silas S. Brown. GPL v3+. # 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 diff --git a/gradint-build/src/frontend.py b/gradint-build/src/frontend.py index e6a160f9173d7f5520c806976186f9d16c305d0f..9d5f231cc704ec1c5f3df044ea4284f1fbde218c 100644 --- a/gradint-build/src/frontend.py +++ b/gradint-build/src/frontend.py @@ -1,5 +1,5 @@ # This file is part of the source code of -# gradint v0.994 (c) 2002-2009 Silas S. Brown. GPL v3+. +# gradint v0.9941 (c) 2002-2009 Silas S. Brown. GPL v3+. # 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 diff --git a/gradint-build/src/lessonplan.py b/gradint-build/src/lessonplan.py index 4f0793e408033169b4f82bbe61fb14b5cbef2a97..912f9630d8c2c05d6e9afea36f9140fd3a0b7930 100644 --- a/gradint-build/src/lessonplan.py +++ b/gradint-build/src/lessonplan.py @@ -1,5 +1,5 @@ # This file is part of the source code of -# gradint v0.994 (c) 2002-2009 Silas S. Brown. GPL v3+. +# gradint v0.9941 (c) 2002-2009 Silas S. Brown. GPL v3+. # 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 diff --git a/gradint-build/src/loop.py b/gradint-build/src/loop.py index d9e61236dc0d4663a46ed48c4bd190e6e0b2b337..d8cece45b99a45bdc925e5286cb2feb74c1c5756 100644 --- a/gradint-build/src/loop.py +++ b/gradint-build/src/loop.py @@ -1,5 +1,5 @@ # This file is part of the source code of -# gradint v0.994 (c) 2002-2009 Silas S. Brown. GPL v3+. +# gradint v0.9941 (c) 2002-2009 Silas S. Brown. GPL v3+. # 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 diff --git a/gradint-build/src/makeevent.py b/gradint-build/src/makeevent.py index fd7eae9ff2f9d530fc9d8aa388cf96641a014bc8..b098a57d9398148c001dd7dd8b572f5dab75238c 100644 --- a/gradint-build/src/makeevent.py +++ b/gradint-build/src/makeevent.py @@ -1,5 +1,5 @@ # This file is part of the source code of -# gradint v0.994 (c) 2002-2009 Silas S. Brown. GPL v3+. +# gradint v0.9941 (c) 2002-2009 Silas S. Brown. GPL v3+. # 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 diff --git a/gradint-build/src/play.py b/gradint-build/src/play.py index 2380ca598ab35049920c88951520fd65df02d051..54c28006a0d063f1e5a0dc4ba17e03dc87cad944 100644 --- a/gradint-build/src/play.py +++ b/gradint-build/src/play.py @@ -1,5 +1,5 @@ # This file is part of the source code of -# gradint v0.994 (c) 2002-2009 Silas S. Brown. GPL v3+. +# gradint v0.9941 (c) 2002-2009 Silas S. Brown. GPL v3+. # 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 diff --git a/gradint-build/src/recording.py b/gradint-build/src/recording.py index e08057c213622d4099599e132021942e43c9ce9d..08ac9b35d41351070d458ec33998b9a9591b7d3e 100644 --- a/gradint-build/src/recording.py +++ b/gradint-build/src/recording.py @@ -1,5 +1,5 @@ # This file is part of the source code of -# gradint v0.994 (c) 2002-2009 Silas S. Brown. GPL v3+. +# gradint v0.9941 (c) 2002-2009 Silas S. Brown. GPL v3+. # 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 diff --git a/gradint-build/src/sequence.py b/gradint-build/src/sequence.py index 888884caf8576f495998543b884e9135df804534..78f102f2b0ee407ebd7eb0a57832624e70c1bcc4 100644 --- a/gradint-build/src/sequence.py +++ b/gradint-build/src/sequence.py @@ -1,5 +1,5 @@ # This file is part of the source code of -# gradint v0.994 (c) 2002-2009 Silas S. Brown. GPL v3+. +# gradint v0.9941 (c) 2002-2009 Silas S. Brown. GPL v3+. # 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 @@ -41,7 +41,7 @@ def anticipation(promptFile,zhFile,numTimesBefore,promptsData): # work out number of repetitions needed. not sure if this should be configurable somewhere. first_repeat_is_unessential = 0 if not numTimesBefore: # New word. If there are L2 variants, introduce them all if possible. - numVariants = max(3,len(variantFiles.get(samplesDirectory+os.sep+zhFile,[0]))) # TODO really max to 3? or 4? or .. ? + numVariants = min(3,len(variantFiles.get(samplesDirectory+os.sep+zhFile,[0]))) # TODO really max to 3? or 4? or .. ? if numVariants>1 and lessonIsTight(): numVariants = 1 # hack numRepeats = numVariants + cond(numVariants>=cond(availablePrompts.user_is_advanced,2,3),0,1) elif numTimesBefore == 1: numRepeats = 3 diff --git a/gradint-build/src/synth.py b/gradint-build/src/synth.py index 3bb2ae233c97a4142d745f24a3cd4d5e041568d7..e3d877806ff4b54979536d6a46a8ae6c13c568f9 100644 --- a/gradint-build/src/synth.py +++ b/gradint-build/src/synth.py @@ -1,5 +1,5 @@ # This file is part of the source code of -# gradint v0.994 (c) 2002-2009 Silas S. Brown. GPL v3+. +# gradint v0.9941 (c) 2002-2009 Silas S. Brown. GPL v3+. # 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 diff --git a/gradint-build/src/system.py b/gradint-build/src/system.py index cf9481ace7da550fd0c8da015d6a05425d5244af..af07f54cf2e4fb87b68f5754f38ec1f655825f51 100644 --- a/gradint-build/src/system.py +++ b/gradint-build/src/system.py @@ -1,5 +1,5 @@ # This file is part of the source code of -# gradint v0.994 (c) 2002-2009 Silas S. Brown. GPL v3+. +# gradint v0.9941 (c) 2002-2009 Silas S. Brown. GPL v3+. # 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 diff --git a/gradint-build/src/top.py b/gradint-build/src/top.py index 47627de5c43d496a6f7d1a4845ab7d18a71a76ec..9913f1ee8ebddfc53b3c3bc65afffd5ed3b82f78 100644 --- a/gradint-build/src/top.py +++ b/gradint-build/src/top.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -program_name = "gradint v0.994 (c) 2002-2009 Silas S. Brown. GPL v3+." +program_name = "gradint v0.9941 (c) 2002-2009 Silas S. Brown. GPL v3+." # 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 diff --git a/gradint-build/thindown.py b/gradint-build/thindown.py index bf56e7aabba416a0ad7bc269cbbe01327e5a51f4..2cd9b5e08ad5bd409880c7e3362e20135b8673a7 100644 --- a/gradint-build/thindown.py +++ b/gradint-build/thindown.py @@ -1,5 +1,5 @@ # This file is part of the source code of -# gradint v0.994 (c) 2002-2009 Silas S. Brown. GPL v3+. +# gradint v0.9941 (c) 2002-2009 Silas S. Brown. GPL v3+. # 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