Binary files /tmp/tmp6WjGlU/zrt2eNstih/lattice-0.20-35/data/barley.rda and /tmp/tmp6WjGlU/PxW0Anqmrm/lattice-0.20-38/data/barley.rda differ Binary files /tmp/tmp6WjGlU/zrt2eNstih/lattice-0.20-35/data/environmental.rda and /tmp/tmp6WjGlU/PxW0Anqmrm/lattice-0.20-38/data/environmental.rda differ Binary files /tmp/tmp6WjGlU/zrt2eNstih/lattice-0.20-35/data/ethanol.rda and /tmp/tmp6WjGlU/PxW0Anqmrm/lattice-0.20-38/data/ethanol.rda differ Binary files /tmp/tmp6WjGlU/zrt2eNstih/lattice-0.20-35/data/melanoma.rda and /tmp/tmp6WjGlU/PxW0Anqmrm/lattice-0.20-38/data/melanoma.rda differ Binary files /tmp/tmp6WjGlU/zrt2eNstih/lattice-0.20-35/data/singer.rda and /tmp/tmp6WjGlU/PxW0Anqmrm/lattice-0.20-38/data/singer.rda differ Binary files /tmp/tmp6WjGlU/zrt2eNstih/lattice-0.20-35/data/USMortality.rda and /tmp/tmp6WjGlU/PxW0Anqmrm/lattice-0.20-38/data/USMortality.rda differ Binary files /tmp/tmp6WjGlU/zrt2eNstih/lattice-0.20-35/data/USRegionalMortality.rda and /tmp/tmp6WjGlU/PxW0Anqmrm/lattice-0.20-38/data/USRegionalMortality.rda differ diff -Nru lattice-0.20-35/debian/changelog lattice-0.20-38/debian/changelog --- lattice-0.20-35/debian/changelog 2018-11-10 14:55:16.000000000 +0000 +++ lattice-0.20-38/debian/changelog 2018-11-10 14:55:17.000000000 +0000 @@ -1,14 +1,14 @@ -lattice (0.20-35-1cran1xenial0) xenial; urgency=medium +lattice (0.20-38-1cran1xenial0) xenial; urgency=medium - * Compilation for Ubuntu 16.04.2 LTS + * Compilation for Ubuntu 16.04.4 LTS - -- Michael Rutter Sun, 02 Apr 2017 13:13:03 +0000 + -- Michael Rutter Sat, 10 Nov 2018 14:53:06 +0000 -lattice (0.20-35-1cran1) testing; urgency=low +lattice (0.20-38-1cran1) testing; urgency=low * cran2deb svn: 362M with DB version 1. - -- cran2deb4ubuntu Sat, 25 Mar 2017 15:03:51 -0400 + -- cran2deb4ubuntu Sun, 04 Nov 2018 09:39:46 -0500 lattice (0.20-6-1cran1) testing; urgency=low @@ -18,6 +18,13 @@ -- cran2deb4ubuntu Sun, 11 Mar 2012 17:47:51 -0400 +lattice (0.20-35-1cran1) testing; urgency=low + + * cran2deb svn: 362M with DB version 1. + + -- cran2deb4ubuntu Sat, 25 Mar 2017 15:04:07 -0400 + + lattice (0.20-34-1cran1) testing; urgency=low * cran2deb svn: 362M with DB version 1. diff -Nru lattice-0.20-35/debian/copyright lattice-0.20-38/debian/copyright --- lattice-0.20-35/debian/copyright 2018-11-10 14:55:16.000000000 +0000 +++ lattice-0.20-38/debian/copyright 2018-11-10 14:55:17.000000000 +0000 @@ -2,7 +2,7 @@ automatically using cran2deb4ubuntu by cran2deb4ubuntu . -The original GNU R package is Copyright (C) 2017 Deepayan Sarkar +The original GNU R package is Copyright (C) 2018 Deepayan Sarkar and possibly others. The original GNU R package is maintained by Deepayan Sarkar diff -Nru lattice-0.20-35/DESCRIPTION lattice-0.20-38/DESCRIPTION --- lattice-0.20-35/DESCRIPTION 2017-03-25 18:05:47.000000000 +0000 +++ lattice-0.20-38/DESCRIPTION 2018-11-04 12:50:03.000000000 +0000 @@ -1,6 +1,6 @@ Package: lattice -Version: 0.20-35 -Date: 2017-03-23 +Version: 0.20-38 +Date: 2018-11-01 Priority: recommended Title: Trellis Graphics for R Author: Deepayan Sarkar @@ -20,6 +20,6 @@ URL: http://lattice.r-forge.r-project.org/ BugReports: https://github.com/deepayan/lattice/issues NeedsCompilation: yes -Packaged: 2017-03-25 11:25:40 UTC; deepayan +Packaged: 2018-11-04 11:39:05 UTC; deepayan Repository: CRAN -Date/Publication: 2017-03-25 18:05:47 UTC +Date/Publication: 2018-11-04 12:50:03 UTC Binary files /tmp/tmp6WjGlU/zrt2eNstih/lattice-0.20-35/inst/po/de/LC_MESSAGES/R-lattice.mo and /tmp/tmp6WjGlU/PxW0Anqmrm/lattice-0.20-38/inst/po/de/LC_MESSAGES/R-lattice.mo differ Binary files /tmp/tmp6WjGlU/zrt2eNstih/lattice-0.20-35/inst/po/en@quot/LC_MESSAGES/R-lattice.mo and /tmp/tmp6WjGlU/PxW0Anqmrm/lattice-0.20-38/inst/po/en@quot/LC_MESSAGES/R-lattice.mo differ Binary files /tmp/tmp6WjGlU/zrt2eNstih/lattice-0.20-35/inst/po/fr/LC_MESSAGES/R-lattice.mo and /tmp/tmp6WjGlU/PxW0Anqmrm/lattice-0.20-38/inst/po/fr/LC_MESSAGES/R-lattice.mo differ Binary files /tmp/tmp6WjGlU/zrt2eNstih/lattice-0.20-35/inst/po/ko/LC_MESSAGES/R-lattice.mo and /tmp/tmp6WjGlU/PxW0Anqmrm/lattice-0.20-38/inst/po/ko/LC_MESSAGES/R-lattice.mo differ Binary files /tmp/tmp6WjGlU/zrt2eNstih/lattice-0.20-35/inst/po/pl/LC_MESSAGES/R-lattice.mo and /tmp/tmp6WjGlU/PxW0Anqmrm/lattice-0.20-38/inst/po/pl/LC_MESSAGES/R-lattice.mo differ diff -Nru lattice-0.20-35/MD5 lattice-0.20-38/MD5 --- lattice-0.20-35/MD5 2017-03-25 18:05:47.000000000 +0000 +++ lattice-0.20-38/MD5 2018-11-04 12:50:03.000000000 +0000 @@ -1,5 +1,5 @@ d72779236b0673f784313dc100ca16d1 *ChangeLog -d28a105afc47eee5adfa1b9437d411ab *DESCRIPTION +c917d768b27ca1b897142ebd90929ae0 *DESCRIPTION eb723b61539feef013de476e68b5c50a *GPL-2 d32239bcb673463ab874e80d47fae504 *GPL-3 82da699a39ddc36665f053c7482a1da6 *LICENSE.note @@ -16,15 +16,15 @@ c01fb10311bebb04855b98a1c40abd22 *R/legend.R c09309a40c089077d283ea7d02d28dfa *R/levelplot.R aec90deb3db94f65c3f0977d69339995 *R/make.groups.R -2151874b3c366663c1b38fb1fd4070b3 *R/miscellaneous.R +678884f7d9c9f9b59ae7dff447f1c477 *R/miscellaneous.R 448c1c26d3b587a76c58836df8b2e666 *R/panel.smooth.R 14a775d0aa3f7ae30fb8aba5c93c1484 *R/panel.smoothscatter.R 0380714a5a5a4ec9535b3501efba4cc4 *R/panel.superpose.R -be370ef0ea4a0dc4e8417175809d93b1 *R/panels.R +3f81623211bd62b9e1b67510ba11c017 *R/panels.R dd13ac0b5cd89c616fdc062af3bdadeb *R/parallel.R -4ce48d090c2ceaf5cea1aa946a692eec *R/print.trellis.R +15a505465dad4a64e5bceea526e157ab *R/print.trellis.R 043234eb0e3c4039004a56188e616310 *R/qq.R -8d16dc4545558f29ef5ec54055e0e6c2 *R/qqmath.R +2b568466e97621bdbd1d808814e85346 *R/qqmath.R 8bfdbdfc4533138dfb83736237982b11 *R/rfs.R 11d54fd77425f5d6785587c8f42bcbaa *R/scales.R 3b55658afd9461a8dc20a5df24d42d35 *R/settings.R @@ -34,28 +34,28 @@ f5c8c7178bb827879815060218696269 *R/summary.trellis.R 776bced283973b7544d7ad0b4db0064d *R/tmd.R 3c405542fd289dedfcf0aa0a02fe9f23 *R/update.trellis.R -49b8041000d9721e28e7977436de02a1 *R/xyplot.R +63f81464f65bfaee4d8f0ebe555fece7 *R/xyplot.R bba242a3753b14ebce29dcd6d9d33d2c *R/xyplot.ts.R 7dab32f13ada41b4296f2d68615dbb73 *R/zzz.R -d7c687ac84f00ee7e105c13314a06a83 *README.md -765ee6e3bc3240ac18845b75292db266 *data/USMortality.rda -839fa6a8802e12e50eee0cc823833dc3 *data/USRegionalMortality.rda -b896eea243a9e0dde2d4cf2290a70587 *data/barley.rda -1ae67b3abf8491f146e72cf92fcc7468 *data/environmental.rda -93de8686fb5a9ba3121e9bd0d568d978 *data/ethanol.rda -1c8aa3771ac201a7c3dad1ea51f6db1f *data/melanoma.rda -588630284b33f436b157adba41d25bb1 *data/singer.rda +192acbf5df95765d57bbba3c898668d9 *README.md +99462016b92e3532d91fc0b086cf96af *data/USMortality.rda +f561d00d2cfaefc4f063ab2ac246d42c *data/USRegionalMortality.rda +b4223ade8c202e066d7af1e164f8c6a7 *data/barley.rda +2f806749aa12cf954e015481a7b0db3f *data/environmental.rda +386ce377a3e17a1e0471d6f54e99b7d4 *data/ethanol.rda +65e9ddb733507420fe32890841597b33 *data/melanoma.rda +b786b569974a4c1a4853bd26ee265fdf *data/singer.rda 5b19b9d9c6ceea57bbd416fd55f4cbbb *demo/00Index 49b53be0f5cfbc31fdf2d1028ab66b01 *demo/intervals.R 9ec1d932fca442660b60818b0be9c0f3 *demo/labels.R aeb8a42c24baed6f0918691449a49681 *demo/lattice.R f5e96e30c746b6c4e1dc57d13218b9e7 *demo/panel.R a6a64750f8d29e22e7abaf210b1dded4 *inst/CITATION -2b442bb4a1806ee9d71b4edbc6d8bdc5 *inst/po/de/LC_MESSAGES/R-lattice.mo -77b1a0bd4f6d755bf46b19eb3795131c *inst/po/en@quot/LC_MESSAGES/R-lattice.mo -eec1e6212e5255c76c7213e11fdf457c *inst/po/fr/LC_MESSAGES/R-lattice.mo -3679ea51468619749499d4fdfa21258d *inst/po/ko/LC_MESSAGES/R-lattice.mo -7e0980c816ea1fa9e5dc4651bfa00842 *inst/po/pl/LC_MESSAGES/R-lattice.mo +dcc520bf7f479b06687828751ee9efd0 *inst/po/de/LC_MESSAGES/R-lattice.mo +6209b3024c4778475ab3a6eb06352ad5 *inst/po/en@quot/LC_MESSAGES/R-lattice.mo +788694610a576ba9a526b40400c66861 *inst/po/fr/LC_MESSAGES/R-lattice.mo +533bf3cb108ea6c8c15af411f4b8ed48 *inst/po/ko/LC_MESSAGES/R-lattice.mo +b411d166a8b3fd56ae8ca8c1fd2536de *inst/po/pl/LC_MESSAGES/R-lattice.mo 355d2d5a8463af6c670b017a3d9e8411 *man/Lattice.Rd 40f3906db75059b7b0c73f544e5bd671 *man/Rows.Rd 7f9e6d0bea5d8524c0a05343efcfcc41 *man/USMortality.Rd @@ -121,12 +121,12 @@ bb1565a3c0f5f1e253adb38c25a05505 *man/utilities.3d.Rd 99b91044de9334f44d66b6c4c09ae0fd *man/xyplot.Rd 61bc7d9f2cec3ca64a4f4c413fd31fef *man/xyplot.ts.Rd -c173e398cfd671dd862294a86fad0a40 *po/R-de.po -e6fd46bf32639ef705d1c776df95e27c *po/R-en@quot.po -d0142a77ff4b63f331093c2626223263 *po/R-fr.po -3ad6a2617b138a820b2a7b12172323c3 *po/R-ko.po -1e3629bf8f448a52b6c8f69e6a6489a1 *po/R-lattice.pot -fe4f01c840dec7524804ae645f329b07 *po/R-pl.po +6a3df19282e5d436766ad974a63ad947 *po/R-de.po +de4d1de32d62c7741110fe846e425d13 *po/R-en@quot.po +5b6fda3a5879067f737cc88a891ffe65 *po/R-fr.po +bf014673f0eee66f3efdd82ae84a553f *po/R-ko.po +4ac4cae73c0e6357005cd2034f03bd0a *po/R-lattice.pot +86501581b49145d99462afd062601cf5 *po/R-pl.po e92972db59c6aa30de492fc63d8a332f *src/init.c 918025909f36306797291250b5360243 *src/threeDplot.c f52b692774cf58f83a86a2269b8f699d *src/threeDplot.h @@ -136,6 +136,7 @@ 200602b6783d415306763b8f61a5d7d1 *tests/fontsize.R 06b9d81d901d35c472384fa447992a3d *tests/levelplot.R a43899ccbd83305ed95dc64cc928aabc *tests/scales.R +e6902eeea9846c7ffe44e1fd1d70b590 *tests/summary.R 4f18dad499267b224e7256637dc32fcf *tests/temp.R 166093c4537eefdb4e92e20174ee5335 *tests/test.R afd9f37525396a26e114781a368fdcca *tests/wireframe.R diff -Nru lattice-0.20-35/po/R-de.po lattice-0.20-38/po/R-de.po --- lattice-0.20-35/po/R-de.po 2017-01-24 12:14:39.000000000 +0000 +++ lattice-0.20-38/po/R-de.po 2018-11-01 07:20:08.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: R 3.2.0 / Lattice 0.20.30\n" "Report-Msgid-Bugs-To: bugs.r-project.org\n" -"POT-Creation-Date: 2015-02-20 19:16\n" +"POT-Creation-Date: 2018-11-01 12:50\n" "PO-Revision-Date: 2015-03-20 23:28+0100\n" "Last-Translator: Detlef Steuer \n" "Language-Team: German \n" @@ -59,11 +59,8 @@ msgid "newFactor cannot be NULL; you have found a bug!" msgstr "newFactor kann nicht NULL sein. Sie haben einen Fehler gefunden!" -msgid "" -"newFactor != NULL && groups == NULL does not hold; you have found a bug!" -msgstr "" -"newFactor != NULL && groups == NULL gilt nicht. Sie haben einen Fehler " -"gefunden!" +msgid "newFactor != NULL && groups == NULL does not hold; you have found a bug!" +msgstr "newFactor != NULL && groups == NULL gilt nicht. Sie haben einen Fehler gefunden!" msgid "Length check mismatch; you have found a bug!" msgstr "Längenprüfung stimmt nicht überein. Sie haben einen Fehler gefunden!" @@ -137,21 +134,14 @@ msgid "panel position unspecified or invalid" msgstr "Position des Bedienfeldes nicht angegeben oder ungültig" -msgid "" -"'trellis.switchFocus' cannot be used to switch to a different 'prefix'. Use " -"'trellis.focus' first" -msgstr "" -"'trellis.switchFocus' kann nicht benutzt werden, um auf einen anderen " -"'prefix' zu schalten. Zuerst 'trellis.focus' benutzen" +msgid "'trellis.switchFocus' cannot be used to switch to a different 'prefix'. Use 'trellis.focus' first" +msgstr "'trellis.switchFocus' kann nicht benutzt werden, um auf einen anderen 'prefix' zu schalten. Zuerst 'trellis.focus' benutzen" msgid "Plot object was not saved, cannot retrieve panel data" -msgstr "" -"Plot-Objekt wurde nicht gespeichert. Panel Daten können nicht abgefragt " -"werden." +msgstr "Plot-Objekt wurde nicht gespeichert. Panel Daten können nicht abgefragt werden." msgid "Plot spans multiple pages, only last page can be updated" -msgstr "" -"Plot umfasst mehrere Seiten. Nur die letzte Seite kann aktualisiert werden" +msgstr "Plot umfasst mehrere Seiten. Nur die letzte Seite kann aktualisiert werden" msgid "You have to first select a panel using trellis.focus()" msgstr "Sie müssen zuerst ein Panel mittels trellis.focus() auswählen." @@ -186,11 +176,8 @@ msgid "first component of text must be vector of labels" msgstr "erste Komponente des Textes muss ein Vektor aus Bezeichnungen sein" -msgid "" -"Invalid key, need at least one component named lines, text, rect or points" -msgstr "" -"Ungültiger Schlüssel. Es wird mindestens eine Komponente mit Namen 'lines', " -"'text', 'rect' oder 'points' benötigt." +msgid "Invalid key, need at least one component named lines, text, rect or points" +msgstr "Ungültiger Schlüssel. Es wird mindestens eine Komponente mit Namen 'lines', 'text', 'rect' oder 'points' benötigt." msgid "not enough rows for columns" msgstr "nicht genug Zeilen für Spalten" @@ -211,8 +198,7 @@ msgstr "Ungültiger label.style" msgid "device support for raster images unknown, ignoring 'raster=TRUE'" -msgstr "" -"Geräteunterstützung für Rastergrafiken unbekannt, ignoriere 'raster=TRUE'" +msgstr "Geräteunterstützung für Rastergrafiken unbekannt, ignoriere 'raster=TRUE'" msgid "device has no raster support, ignoring 'raster=TRUE'" msgstr "Gerät unterstützt keine Rastergrafik, ignoriere 'raster=TRUE'" @@ -238,12 +224,8 @@ msgid "(loaded the KernSmooth namespace)" msgstr "(lud den KernSmooth-Namensraum)" -msgid "" -"panel.smoothScatter() requires the KernSmooth package, but unable to load " -"KernSmooth namespace" -msgstr "" -"panel.smoothScatter() benötigt das KernSmooth-Paket, aber der KernSmooth-" -"Namensraum kann nicht geladen werden." +msgid "panel.smoothScatter() requires the KernSmooth package, but unable to load KernSmooth namespace" +msgstr "panel.smoothScatter() benötigt das KernSmooth-Paket, aber der KernSmooth-Namensraum kann nicht geladen werden." msgid "'nbin' must be numeric of length 1 or 2" msgstr "'nbin' muss numerisch und von der Länge 1 oder 2 sein" @@ -285,12 +267,6 @@ msgid "y must have exactly 2 levels" msgstr "y muss genau 2 Stufen haben" -msgid "missing values and NaN's not allowed if 'na.rm' is FALSE" -msgstr "fehlende Werte und NaNs nicht erlaubt, wenn 'na.rm' FALSE ist" - -msgid "'probs' outside [0,1]" -msgstr "'probs' außerhalb [0,1]" - msgid "Can't have log X-scale" msgstr "X-Achse kann keine logarithmische Skala haben" @@ -309,12 +285,8 @@ msgid "Multiple matches to component name" msgstr "Mehrere Übereinstimmungen mit dem Komponentennamen" -msgid "" -"the 'at' and 'labels' components of 'scales' may not be lists when 'relation " -"= \"same\"'" -msgstr "" -"die 'at'- und 'labels'-Komponenten der Skalen sind möglicherweise keine " -"Listen, wenn 'relation = \"same\"'" +msgid "the 'at' and 'labels' components of 'scales' may not be lists when 'relation = \"same\"'" +msgstr "die 'at'- und 'labels'-Komponenten der Skalen sind möglicherweise keine Listen, wenn 'relation = \"same\"'" msgid "limits cannot be a list when relation = same" msgstr "Begrenzungen können keine Liste sein, wenn 'relation = same'" @@ -328,12 +300,8 @@ msgid "'aspect=\"iso\"' approximate since 'relation=\"free\"'" msgstr "'aspect=\"iso\"' ungefähr seit 'relation=\"free\"'" -msgid "" -"Note: The default device has been opened to honour attempt to modify trellis " -"settings" -msgstr "" -"Anmerkung: Das Standardgerät wurde geöffnet, um zu versuchen, das Verändern " -"von Trellis-Einstellungen zu akzeptieren." +msgid "Note: The default device has been opened to honour attempt to modify trellis settings" +msgstr "Anmerkung: Das Standardgerät wurde geöffnet, um zu versuchen, das Verändern von Trellis-Einstellungen zu akzeptieren." msgid "Invalid 'theme' specified" msgstr "Ungültiges 'theme' angegeben" @@ -341,11 +309,8 @@ msgid "Could not find device function '%s'" msgstr "Gerätefunktion '%s' konnte nicht gefunden werden" -msgid "" -"'trellis.device' has changed, 'bg' may not be doing what you think it is" -msgstr "" -"'trellis.device' wurde geändert, 'bg' tut möglicherweise nicht das, was Sie " -"denken" +msgid "'trellis.device' has changed, 'bg' may not be doing what you think it is" +msgstr "'trellis.device' wurde geändert, 'bg' tut möglicherweise nicht das, was Sie denken" msgid "x must be a shingle" msgstr "x muss eine Kachel sein" @@ -427,11 +392,8 @@ msgid "log scales cannot be changed via 'update'" msgstr "logarithmische Skalen können nicht per 'update' geändert werden" -msgid "" -"the at and labels components of scales may not be lists when relation = same" -msgstr "" -"die 'at'- und 'labels'-Komponenten der Skalen sind möglicherweise keine " -"Listen, wenn 'relation = same'" +msgid "the at and labels components of scales may not be lists when relation = same" +msgstr "die 'at'- und 'labels'-Komponenten der Skalen sind möglicherweise keine Listen, wenn 'relation = same'" msgid "Unrecognized value of 'aspect': '%s'" msgstr "Nicht erkannter Wert von 'aspect': '%s'" @@ -445,6 +407,12 @@ msgid "Invalid indices" msgstr "Falsche Indizes" +#~ msgid "missing values and NaN's not allowed if 'na.rm' is FALSE" +#~ msgstr "fehlende Werte und NaNs nicht erlaubt, wenn 'na.rm' FALSE ist" + +#~ msgid "'probs' outside [0,1]" +#~ msgstr "'probs' außerhalb [0,1]" + #~ msgid "regression coefficients" #~ msgstr "Regressionskoeffizienten" @@ -465,12 +433,8 @@ #~ msgid "at least one element of layout must be positive" #~ msgstr "mindestens ein Element des Layouts muss positiv sein" -#~ msgid "" -#~ "'packet.number' and 'panel.number' are no longer supplied to the panel " -#~ "function. See ?packet.number" -#~ msgstr "" -#~ "'packet.number' und 'panel.number' werden nicht länger an die 'panel'-" -#~ "Funktion weitergereicht. Siehe ?packet.number" +#~ msgid "'packet.number' and 'panel.number' are no longer supplied to the panel function. See ?packet.number" +#~ msgstr "'packet.number' und 'panel.number' werden nicht länger an die 'panel'-Funktion weitergereicht. Siehe ?packet.number" #~ msgid "currently saved object is not the last one plotted" #~ msgstr "derzeit gespeichertes Objekt ist nicht das zuletzt dargestellte" diff -Nru lattice-0.20-35/po/R-en@quot.po lattice-0.20-38/po/R-en@quot.po --- lattice-0.20-35/po/R-en@quot.po 2017-01-24 12:14:39.000000000 +0000 +++ lattice-0.20-38/po/R-en@quot.po 2018-11-01 07:20:08.000000000 +0000 @@ -24,7 +24,7 @@ msgstr "" "Project-Id-Version: R 2.10.0\n" "Report-Msgid-Bugs-To: bugs.r-project.org\n" -"POT-Creation-Date: 2015-02-20 19:16\n" +"POT-Creation-Date: 2018-11-01 12:50\n" "PO-Revision-Date: 2009-09-30 04:37\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -294,12 +294,6 @@ msgid "y must have exactly 2 levels" msgstr "y must have exactly 2 levels" -msgid "missing values and NaN's not allowed if 'na.rm' is FALSE" -msgstr "missing values and NaN's not allowed if ‘na.rm’ is FALSE" - -msgid "'probs' outside [0,1]" -msgstr "‘probs’ outside [0,1]" - msgid "Can't have log X-scale" msgstr "Can't have log X-scale" @@ -441,6 +435,12 @@ msgid "Invalid indices" msgstr "Invalid indices" +#~ msgid "missing values and NaN's not allowed if 'na.rm' is FALSE" +#~ msgstr "missing values and NaN's not allowed if ‘na.rm’ is FALSE" + +#~ msgid "'probs' outside [0,1]" +#~ msgstr "‘probs’ outside [0,1]" + #~ msgid "regression coefficients" #~ msgstr "regression coefficients" diff -Nru lattice-0.20-35/po/R-fr.po lattice-0.20-38/po/R-fr.po --- lattice-0.20-35/po/R-fr.po 2017-01-24 12:14:39.000000000 +0000 +++ lattice-0.20-38/po/R-fr.po 2018-11-01 07:20:08.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lattice 0.13-1\n" "Report-Msgid-Bugs-To: bugs.r-project.org\n" -"POT-Creation-Date: 2015-02-20 19:16\n" +"POT-Creation-Date: 2018-11-01 12:50\n" "PO-Revision-Date: 2014-03-18 11:31+0100\n" "Last-Translator: Philippe Grosjean \n" "Language-Team: French \n" @@ -269,12 +269,6 @@ msgid "y must have exactly 2 levels" msgstr "'y' doit avoir exactement 2 niveaux" -msgid "missing values and NaN's not allowed if 'na.rm' is FALSE" -msgstr "les valeurs manquantes et les NaN's ne sont pas permis lorsque 'na.rm = FALSE'" - -msgid "'probs' outside [0,1]" -msgstr "'probs' en dehors de [0,1]" - msgid "Can't have log X-scale" msgstr "axe X logarithmique impossible" @@ -414,6 +408,12 @@ msgid "Invalid indices" msgstr "Indices incorrects" +#~ msgid "missing values and NaN's not allowed if 'na.rm' is FALSE" +#~ msgstr "les valeurs manquantes et les NaN's ne sont pas permis lorsque 'na.rm = FALSE'" + +#~ msgid "'probs' outside [0,1]" +#~ msgstr "'probs' en dehors de [0,1]" + #~ msgid "regression coefficients" #~ msgstr "coefficients de régression" diff -Nru lattice-0.20-35/po/R-ko.po lattice-0.20-38/po/R-ko.po --- lattice-0.20-35/po/R-ko.po 2017-01-24 12:14:39.000000000 +0000 +++ lattice-0.20-38/po/R-ko.po 2018-11-01 07:20:08.000000000 +0000 @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: R 3.2.0\n" "Report-Msgid-Bugs-To: bugs.r-project.org\n" -"POT-Creation-Date: 2015-02-20 19:16\n" +"POT-Creation-Date: 2018-11-01 12:50\n" "PO-Revision-Date: 2015-02-09 00:06-0600\n" "Last-Translator:Chel Hee Lee \n" "Language-Team: Chel Hee Lee \n" @@ -275,12 +275,6 @@ msgid "y must have exactly 2 levels" msgstr "y는 반드시 2개의 수준(levels)을 가지고 있어야 합니다." -msgid "missing values and NaN's not allowed if 'na.rm' is FALSE" -msgstr "'na.rm'가 FALSE이라면 결측값 또는 NaN이 있어서는 안됩니다." - -msgid "'probs' outside [0,1]" -msgstr "'probs'가 [0,1] 범위 밖에 있습니다" - msgid "Can't have log X-scale" msgstr "log X-scale을 가질 수 없습니다." @@ -420,5 +414,11 @@ msgid "Invalid indices" msgstr "잘못된 인덱스입니다" +#~ msgid "missing values and NaN's not allowed if 'na.rm' is FALSE" +#~ msgstr "'na.rm'가 FALSE이라면 결측값 또는 NaN이 있어서는 안됩니다." + +#~ msgid "'probs' outside [0,1]" +#~ msgstr "'probs'가 [0,1] 범위 밖에 있습니다" + #~ msgid "regression coefficients" #~ msgstr "개의 회귀 계수들 중에서 처음 두개만을 사용합니다." diff -Nru lattice-0.20-35/po/R-lattice.pot lattice-0.20-38/po/R-lattice.pot --- lattice-0.20-35/po/R-lattice.pot 2017-03-23 14:50:30.000000000 +0000 +++ lattice-0.20-38/po/R-lattice.pot 2018-11-04 11:36:40.000000000 +0000 @@ -1,8 +1,8 @@ msgid "" msgstr "" -"Project-Id-Version: R 3.4.0\n" +"Project-Id-Version: R 3.6.0\n" "Report-Msgid-Bugs-To: bugs.r-project.org\n" -"POT-Creation-Date: 2017-03-23 14:02\n" +"POT-Creation-Date: 2018-11-04 17:06\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -257,12 +257,6 @@ msgid "y must have exactly 2 levels" msgstr "" -msgid "missing values and NaN's not allowed if 'na.rm' is FALSE" -msgstr "" - -msgid "'probs' outside [0,1]" -msgstr "" - msgid "Can't have log X-scale" msgstr "" diff -Nru lattice-0.20-35/po/R-pl.po lattice-0.20-38/po/R-pl.po --- lattice-0.20-35/po/R-pl.po 2017-01-24 12:14:39.000000000 +0000 +++ lattice-0.20-38/po/R-pl.po 2018-11-01 07:20:08.000000000 +0000 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: lattice 0.20-27\n" "Report-Msgid-Bugs-To: bugs.r-project.org\n" -"POT-Creation-Date: 2015-02-20 19:16\n" +"POT-Creation-Date: 2018-11-01 12:50\n" "PO-Revision-Date: 2014-03-25 21:26+0100\n" "Last-Translator: Łukasz Daniel \n" "Language-Team: Łukasz Daniel \n" @@ -513,16 +513,6 @@ msgid "y must have exactly 2 levels" msgstr "'y' musi mieć dokładnie 2 poziomy" -# lattice/R/qqmath.R: 35 -# stop("missing values and NaN's not allowed if 'na.rm' is FALSE") -msgid "missing values and NaN's not allowed if 'na.rm' is FALSE" -msgstr "brakujące wartości oraz wartości NaN nie są dozwolone jeśli 'na.rm' ma wartość FALSE" - -# lattice/R/qqmath.R: 37 -# stop("'probs' outside [0,1]") -msgid "'probs' outside [0,1]" -msgstr "wartości 'probs' poza przedziałem [0,1]" - # lattice/R/qqmath.R: 372 # warning("Can't have log X-scale") msgid "Can't have log X-scale" @@ -772,6 +762,16 @@ msgid "Invalid indices" msgstr "niepoprawne indeksy" +# lattice/R/qqmath.R: 35 +# stop("missing values and NaN's not allowed if 'na.rm' is FALSE") +#~ msgid "missing values and NaN's not allowed if 'na.rm' is FALSE" +#~ msgstr "brakujące wartości oraz wartości NaN nie są dozwolone jeśli 'na.rm' ma wartość FALSE" + +# lattice/R/qqmath.R: 37 +# stop("'probs' outside [0,1]") +#~ msgid "'probs' outside [0,1]" +#~ msgstr "wartości 'probs' poza przedziałem [0,1]" + # lattice/R/panels.R: 54 # warning("only using the first two of ", p, "regression coefficients") #~ msgid "regression coefficients" diff -Nru lattice-0.20-35/R/miscellaneous.R lattice-0.20-38/R/miscellaneous.R --- lattice-0.20-35/R/miscellaneous.R 2017-01-24 13:18:48.000000000 +0000 +++ lattice-0.20-38/R/miscellaneous.R 2017-05-12 07:16:03.000000000 +0000 @@ -18,7 +18,6 @@ ### MA 02110-1301, USA - ## For historical reasons (i.e., S-compatibility) there are several ## places in lattice where an argument that is supposed to be a ## function may be specified as a character string. It is not diff -Nru lattice-0.20-35/R/panels.R lattice-0.20-38/R/panels.R --- lattice-0.20-35/R/panels.R 2017-03-23 14:50:30.000000000 +0000 +++ lattice-0.20-38/R/panels.R 2018-07-09 11:31:39.000000000 +0000 @@ -99,7 +99,7 @@ sign.dist.from.line <- function(x, y) { - as.integer(sign(y - coeff[1] - coeff[2] * x)) ## / sqrt(1 + coeff[2]^2) + as.integer(sign(zapsmall(y - coeff[1] - coeff[2] * x))) } force(sign.dist.from.line) sign.corners <- @@ -123,14 +123,16 @@ ..., identifier = id) } + ## Do opposite sides first to make sure diagonal edge cases + ## proceed along the correct branch if (D && B) # Case I drawfun(xx[1], yfun(xx[1]), xx[2], yfun(xx[2]), ...) + else if (A && C) # Case IV + drawfun(xfun(yy[1]), yy[1], xfun(yy[2]), yy[2], ...) else if (D && C) # Case II drawfun(xx[1], yfun(xx[1]), xfun(yy[2]), yy[2], ...) else if (A && B) # Case III drawfun(xfun(yy[1]), yy[1], xx[2], yfun(xx[2]), ...) - else if (A && C) # Case IV - drawfun(xfun(yy[1]), yy[1], xfun(yy[2]), yy[2], ...) else if (B && C) # Case V drawfun(xfun(yy[1]), yy[1], xfun(yy[2]), yy[2], ...) else if (A && D) # Case VI diff -Nru lattice-0.20-35/R/print.trellis.R lattice-0.20-38/R/print.trellis.R --- lattice-0.20-35/R/print.trellis.R 2017-01-24 12:14:39.000000000 +0000 +++ lattice-0.20-38/R/print.trellis.R 2018-11-01 07:19:31.000000000 +0000 @@ -108,7 +108,12 @@ grobFromLabelList <- function(lab, name = "label", orient = 0) { - if (is.null(lab) || (is.character(lab) && (lab == "" || length(lab) == 0))) return (NULL) + emptyLabel <- function(lab) + { + is.null(lab) || length(lab) == 0 || (is.character(lab) && !any(nzchar(lab))) + ## NOTE: lab could also be "empty" expression / call / symbol, but we're not checking + } + if (emptyLabel(lab)) return (NULL) if (inherits(lab, "grob")) return(lab) process.lab <- function(label, rot = orient, @@ -130,8 +135,7 @@ ans } lab <- do.call(process.lab, lab) - if (with(lab, is.null(label) || (is.character(label) && (label == "" || length(label) == 0)))) - return (NULL) + if (with(lab, emptyLabel(label))) return (NULL) if (is.null(lab$x)) lab$x <- if (orient == 0) ppoints(n = length(lab$label), a = 0.5) diff -Nru lattice-0.20-35/R/qqmath.R lattice-0.20-38/R/qqmath.R --- lattice-0.20-35/R/qqmath.R 2017-01-24 12:14:39.000000000 +0000 +++ lattice-0.20-38/R/qqmath.R 2018-11-01 06:50:45.000000000 +0000 @@ -20,90 +20,6 @@ -## FIXME: should be retired (quantile is good enough now, but check first) - -fast.quantile <- - function(x, - probs = seq(0, 1, 0.25), - na.rm = FALSE, - names = FALSE, - type = 7, ...) -{ - if (na.rm) - x <- x[!is.na(x)] - else if (any(is.na(x))) - stop("missing values and NaN's not allowed if 'na.rm' is FALSE") - if (any((p.ok <- !is.na(probs)) & (probs < 0 | probs > 1))) - stop("'probs' outside [0,1]") - n <- length(x) - if (na.p <- any(!p.ok)) { - o.pr <- probs - probs <- probs[p.ok] - } - np <- length(probs) - if (n > 0 && np > 0) { - if (type == 7) { - index <- 1 + (n - 1) * probs - lo <- floor(index) - hi <- ceiling(index) - x <- sort(x) - i <- index > lo - qs <- x[lo] - i <- seq_along(i)[i & !is.na(i)] - h <- (index - lo)[i] - qs[i] <- ifelse(h == 0, qs[i], (1 - h) * qs[i] + - h * x[hi[i]]) - } - else { - if (type <= 3) { - nppm <- if (type == 3) - n * probs - 0.5 - else n * probs - j <- floor(nppm) - switch(type, h <- ifelse(nppm > j, 1, 0), h <- ifelse(nppm > - j, 1, 0.5), h <- ifelse((nppm == j) & ((j%%2) == - 0), 0, 1)) - } - else { - switch(type - 3, { - a <- 0 - b <- 1 - }, a <- b <- 0.5, a <- b <- 0, a <- b <- 1, a <- b <- 1/3, - a <- b <- 3/8) - fuzz <- 4 * .Machine$double.eps - nppm <- a + probs * (n + 1 - a - b) - j <- floor(nppm + fuzz) - h <- nppm - j - h <- ifelse(abs(h) < fuzz, 0, h) - } - x <- sort(x) - x <- c(x[1], x[1], x, x[n], x[n]) - qs <- ifelse(h == 0, x[j + 2], ifelse(h == 1, x[j + - 3], (1 - h) * x[j + 2] + h * x[j + 3])) - } - } - else { - qs <- rep(NA_real_, np) - } - if (names && np > 0) { - dig <- max(2, getOption("digits")) - names(qs) <- paste(if (np < 100) - formatC(100 * probs, format = "fg", width = 1, digits = dig) - else format(100 * probs, trim = TRUE, digits = dig), - "%", sep = "") - } - if (na.p) { - o.pr[p.ok] <- qs - names(o.pr) <- rep("", length(o.pr)) - names(o.pr)[p.ok] <- names(qs) - o.pr - } - else qs -} - - - - prepanel.default.qqmath <- function(x, diff -Nru lattice-0.20-35/R/xyplot.R lattice-0.20-38/R/xyplot.R --- lattice-0.20-35/R/xyplot.R 2017-01-24 12:14:39.000000000 +0000 +++ lattice-0.20-38/R/xyplot.R 2018-11-01 08:47:02.000000000 +0000 @@ -319,8 +319,16 @@ dots <- foo$dots # arguments not processed by trellis.skeleton foo <- foo$foo + +### FIXME: For a long time, lattice has used foo$call <- sys.call(sys.parent()); foo$call[[1]] <- quote(xyplot) - ## This is NOT OK: foo$call <- sys.call(); foo$call[[1]] <- quote(xyplot) +### But this doesn't work in all contexts; e.g., +### with(cars, xyplot(speed ~ dist))$call + +### This works better, but is NOT OK for other methods that call +### xyplot.formula(). So EVERY METHOD must include this line of code +### to get the correct call component + ## foo$call <- sys.call(); foo$call[[1]] <- quote(xyplot) ## Step 2: Compute scales.common (leaving out limits for now) diff -Nru lattice-0.20-35/README.md lattice-0.20-38/README.md --- lattice-0.20-35/README.md 2017-01-24 12:14:39.000000000 +0000 +++ lattice-0.20-38/README.md 2018-11-01 07:25:19.000000000 +0000 @@ -1,4 +1,9 @@ # Lattice -Lattice is a powerful and elegant high-level data visualization system for R, inspired by Trellis graphics. It is designed with an emphasis on multivariate data, and in particular allows easy conditioning to produce "small multiple" plots. Lattice is sufficient for typical graphics needs, and is also flexible enough to handle most nonstandard requirements. +Lattice is a powerful and elegant high-level data visualization system +for R, inspired by Trellis graphics. It is designed with an emphasis +on multivariate data, and in particular allows easy conditioning to +produce "small multiple" plots. Lattice is sufficient for typical +graphics needs, and is also flexible enough to handle most nonstandard +requirements. diff -Nru lattice-0.20-35/tests/summary.R lattice-0.20-38/tests/summary.R --- lattice-0.20-35/tests/summary.R 1970-01-01 00:00:00.000000000 +0000 +++ lattice-0.20-38/tests/summary.R 2018-07-09 11:26:31.000000000 +0000 @@ -0,0 +1,65 @@ + +library(lattice) + +## Output of summary() methods + +d <- list(x = 1:10, y = 1:10, g = gl(2, 5)) + +summary(barchart(factor(y) ~ x, d)) # S3method(barchart, formula) +summary(barchart(unclass(Titanic))) # S3method(barchart, array) + # S3method(barchart, default) +summary(barchart(VADeaths)) # S3method(barchart, matrix) +summary(barchart(precip)) # S3method(barchart, numeric) +summary(barchart(Titanic)) # S3method(barchart, table) + +summary(bwplot(g ~ x, d)) # S3method(bwplot, formula) +summary(bwplot(precip)) # S3method(bwplot, numeric) + +summary(densityplot( ~ x | g, d)) # S3method(densityplot, formula) +summary(densityplot(precip)) # S3method(densityplot, numeric) + +summary(dotplot(factor(y) ~ x, d)) # S3method(dotplot, formula) +summary(dotplot(unclass(Titanic))) # S3method(dotplot, array) + # S3method(dotplot, default) +summary(dotplot(VADeaths)) # S3method(dotplot, matrix) +summary(dotplot(precip)) # S3method(dotplot, numeric) +summary(dotplot(Titanic)) # S3method(dotplot, table) + + +## S3method(histogram, formula) +## S3method(histogram, factor) +## S3method(histogram, numeric) +## S3method(qqmath, formula) +## S3method(qqmath, numeric) +## S3method(stripplot, formula) +## S3method(stripplot, numeric) +## S3method(qq, formula) + +summary(xyplot(y ~ x | g, data = d)) # S3method(xyplot, formula) +summary(with(d, xyplot(y ~ x | g))) # S3method(xyplot, formula) +summary(xyplot(sunspot.year)) # S3method(xyplot, ts) + +## S3method(levelplot, formula) +## S3method(levelplot, table) +## S3method(levelplot, array) +## S3method(levelplot, matrix) +## S3method(contourplot, formula) +## S3method(contourplot, table) +## S3method(contourplot, array) +## S3method(contourplot, matrix) +## S3method(cloud, formula) +## S3method(cloud, matrix) +## S3method(cloud, table) +## S3method(wireframe, formula) +## S3method(wireframe, matrix) +## S3method(splom, formula) +## S3method(splom, matrix) +## S3method(splom, data.frame) + +## S3method(parallelplot, formula) +## S3method(parallelplot, matrix) +## S3method(parallelplot, data.frame) + + + +