From 69fb3c71539aa93a0b54e1203040db0d8a5b6862 Mon Sep 17 00:00:00 2001 From: Christoph Date: Sat, 31 Dec 2022 13:04:53 +0100 Subject: [PATCH 1/5] Fix date parser for year/month (#9507) * Fix date parser for year/month * add changelog --- CHANGELOG.md | 1 + .../gui/fieldeditors/DateEditorViewModel.java | 13 ++++++++++++- src/main/java/org/jabref/model/entry/Date.java | 2 +- src/test/java/org/jabref/model/entry/DateTest.java | 3 ++- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 698e1bd20ad..87c07a636a7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,6 +31,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve - The tab "deprecated fields" is shown in biblatex-mode only. [#7757](https://github.com/JabRef/jabref/issues/7757) - We fixed an issue where the last opened libraries were not remembered when a new unsaved libray was open as well [#9190](https://github.com/JabRef/jabref/issues/9190) - We fixed an issue where no context menu for the group "All entries" was present [forum#3682](https://discourse.jabref.org/t/how-sort-groups-a-z-not-subgroups/3682) +- We fixed an issue where entering a date in the format "YYYY/MM" in the entry editor date field caused an exception [#9492](https://github.com/JabRef/jabref/issues/9492) ### Removed diff --git a/src/main/java/org/jabref/gui/fieldeditors/DateEditorViewModel.java b/src/main/java/org/jabref/gui/fieldeditors/DateEditorViewModel.java index 61992127eb8..d0f5af4d291 100644 --- a/src/main/java/org/jabref/gui/fieldeditors/DateEditorViewModel.java +++ b/src/main/java/org/jabref/gui/fieldeditors/DateEditorViewModel.java @@ -1,5 +1,6 @@ package org.jabref.gui.fieldeditors; +import java.time.DateTimeException; import java.time.format.DateTimeFormatter; import java.time.format.DateTimeParseException; import java.time.temporal.TemporalAccessor; @@ -12,7 +13,12 @@ import org.jabref.model.entry.field.Field; import org.jabref.model.strings.StringUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + public class DateEditorViewModel extends AbstractEditorViewModel { + + private static final Logger LOGGER = LoggerFactory.getLogger(DateEditorViewModel.class); private final DateTimeFormatter dateFormatter; public DateEditorViewModel(Field field, SuggestionProvider suggestionProvider, DateTimeFormatter dateFormatter, FieldCheckers fieldCheckers) { @@ -25,7 +31,12 @@ public StringConverter getDateToStringConverter() { @Override public String toString(TemporalAccessor date) { if (date != null) { - return dateFormatter.format(date); + try { + return dateFormatter.format(date); + } catch (DateTimeException ex) { + LOGGER.error("Could not format date", ex); + return ""; + } } else { return ""; } diff --git a/src/main/java/org/jabref/model/entry/Date.java b/src/main/java/org/jabref/model/entry/Date.java index 2b0cf0dd8a9..22253fbe2b6 100644 --- a/src/main/java/org/jabref/model/entry/Date.java +++ b/src/main/java/org/jabref/model/entry/Date.java @@ -33,6 +33,7 @@ public class Date { "uuuu-MM-dd'T'H[:ss][xxx][xx][X]", // covers 2018-10-03T7 "uuuu-M-d", // covers 2009-1-15 "uuuu-M", // covers 2009-11 + "uuuu/M", // covers 2020/10 "d-M-uuuu", // covers 15-1-2012 "M-uuuu", // covers 1-2012 "M/uuuu", // covers 9/2015 and 09/2015 @@ -43,7 +44,6 @@ public class Date { "uuuu.M.d", // covers 2015.1.15 "uuuu", // covers 2015 "MMM, uuuu", // covers Jan, 2020 - "uuuu/M", // covers 2020/10 "uuuu.MM.d" // covers 2015.10.15 ); diff --git a/src/test/java/org/jabref/model/entry/DateTest.java b/src/test/java/org/jabref/model/entry/DateTest.java index c81cbee2700..8a30c53a94e 100644 --- a/src/test/java/org/jabref/model/entry/DateTest.java +++ b/src/test/java/org/jabref/model/entry/DateTest.java @@ -44,7 +44,8 @@ private static Stream validDates() { Arguments.of(Year.of(2015), "2015"), Arguments.of(YearMonth.of(2020, Month.JANUARY), "Jan, 2020"), Arguments.of(LocalDate.of(2015, Month.OCTOBER, 15), "2015.10.15"), - Arguments.of(LocalDate.of(-10000, Month.OCTOBER, 15), "-10000-10-15") + Arguments.of(LocalDate.of(-10000, Month.OCTOBER, 15), "-10000-10-15"), + Arguments.of(YearMonth.of(2015, Month.NOVEMBER), "2015/11") ); } From 228ad99f542f2a82970d4bd38229a7d84ef00b85 Mon Sep 17 00:00:00 2001 From: Christoph Date: Sat, 31 Dec 2022 13:05:05 +0100 Subject: [PATCH 2/5] try to repack deb file (#9506) * try to repack deb file Workaround for 9472 * overwrite existing when moving * fix workflow syntax --- .github/workflows/deployment.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml index 1b6c1b7b4c3..c7a90179ec9 100644 --- a/.github/workflows/deployment.yml +++ b/.github/workflows/deployment.yml @@ -142,6 +142,17 @@ jobs: run: | get-childitem -Path build/distribution/* | rename-item -NewName {$_.name -replace "${{ steps.gitversion.outputs.AssemblySemVer }}","${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}"} get-childitem -Path build/distribution/* | rename-item -NewName {$_.name -replace "portable","${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}-portable"} + - name: Repack deb file for Debian (compression) + if: (matrix.os == 'ubuntu-latest') + shell: bash + run: | + cd build/distribution + ar x jabref_${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}_amd64.deb + zstd -d < control.tar.zst | xz > control.tar.xz + zstd -d < data.tar.zst | xz > data.tar.xz + ar -m -c -a sdsd jabref_${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}_amd64_repackaged.deb debian-binary control.tar.xz data.tar.xz + rm debian-binary control.tar.* data.tar.* + mv -f jabref_${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}_amd64_repackaged.deb jabref_${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}_amd64.deb - name: Upload to GitHub workflow artifacts store if: (matrix.os != 'macos-latest') || (steps.checksecrets.outputs.secretspresent == 'YES') uses: actions/upload-artifact@v3 From bec415c5b7c1b5202f4af6eef063573e7606047f Mon Sep 17 00:00:00 2001 From: github actions Date: Sun, 1 Jan 2023 02:33:01 +0000 Subject: [PATCH 3/5] Squashed 'buildres/csl/csl-styles/' changes from 84dba23af3..43566f2727 43566f2727 Update molecular-oncology.csl (#6354) 38f2b5fe97 Update san-francisco-estuary-and-watershed-science.csl (#6350) 724cb124c5 Update australasian-journal-of-philosophy.csl (#6344) df6af865b2 Fix webpage in-text citation for council-of-science-editors-author-date.csl (#6318) 6900b58877 Add month to magazine for Bluebook e0a814866a Update cambridge-university-press-author-date-cambridge-a.csl (#6345) 08234487ea Add space & comma before pp (#6343) ff38cd2773 Update american-journal-of-respiratory-and-critical-care-medicine.csl (#6341) 8727dfb8d8 Update early-music-history.csl (#6323) 1154354311 Update boletin-de-pediatria.csl (#6310) f25438ef53 Update pravnik.csl (#6309) db7a4aefad Update zoological-journal-of-the-linnean-society.csl (#6304) 6c043a76f0 Create polygraphia.csl (#6307) 255e00c8d7 Create intellect-newgen-books.csl (#6308) 323629fdf3 Update historical-materialism.csl (#6300) f62b70d128 Create european-review-of-international-studies.csl (#6301) dff26985b6 Update ucl-university-college-harvard.csl (#6298) 0ce09c9652 Update sciences-po-ecole-doctorale-note-french.csl (#6290) bdd53ec21d Update sciences-po-ecole-doctorale-author-date.csl (#6291) efde4d4924 Create journal-of-law-medicine-ethics.csl (#6296) 7539b2c5e4 Create theses-de-sorbonne-universite.csl (#6295) 905f25aa58 Update biochemical-society-transactions.csl (#6292) a76a3f5e5a Update smithsonian-institution-scholarly-press author-date and note (#6294) e6b6c6c521 Create exploration-of-targeted-anti-tumor-therapy.csl (#6276) 024c9c88d1 Create nys-nydanske-studier.csl (#6331) d9ac8e1e07 Update vox-sanguinis.csl (#6327) 9a98e92e47 Remove DOI from Genetics & Molecular Biology git-subtree-dir: buildres/csl/csl-styles git-subtree-split: 43566f2727f6618454cf9e1c8f98fa41d4392400 --- ...respiratory-and-critical-care-medicine.csl | 8 +- australasian-journal-of-philosophy.csl | 16 +- biochemical-society-transactions.csl | 123 +- bluebook-law-review.csl | 7 +- boletin-de-pediatria.csl | 3 +- ...iversity-press-author-date-cambridge-a.csl | 5 +- cambridge-university-press-author-date.csl | 2 +- council-of-science-editors-author-date.csl | 2 +- early-music-history.csl | 30 +- european-review-of-international-studies.csl | 873 +++++++++ ...oration-of-targeted-anti-tumor-therapy.csl | 328 ++++ genetics-and-molecular-biology.csl | 1 - historical-materialism.csl | 26 +- intellect-newgen-books.csl | 374 ++++ journal-of-law-medicine-ethics.csl | 231 +++ molecular-oncology.csl | 623 +------ nys-nydanske-sprogstudier.csl | 431 +++++ polygraphia.csl | 240 +++ pravnik.csl | 14 +- ...rancisco-estuary-and-watershed-science.csl | 73 +- sciences-po-ecole-doctorale-author-date.csl | 49 +- sciences-po-ecole-doctorale-note-french.csl | 50 +- ...nstitution-scholarly-press-author-date.csl | 13 +- ...onian-institution-scholarly-press-note.csl | 9 +- theses-de-sorbonne-universite.csl | 1599 +++++++++++++++++ ucl-university-college-harvard.csl | 6 +- vox-sanguinis.csl | 9 +- zoological-journal-of-the-linnean-society.csl | 10 +- 28 files changed, 4434 insertions(+), 721 deletions(-) create mode 100644 european-review-of-international-studies.csl create mode 100644 exploration-of-targeted-anti-tumor-therapy.csl create mode 100644 intellect-newgen-books.csl create mode 100644 journal-of-law-medicine-ethics.csl create mode 100644 nys-nydanske-sprogstudier.csl create mode 100644 polygraphia.csl create mode 100644 theses-de-sorbonne-universite.csl diff --git a/american-journal-of-respiratory-and-critical-care-medicine.csl b/american-journal-of-respiratory-and-critical-care-medicine.csl index 3e8265735b5..c002e0c25e5 100644 --- a/american-journal-of-respiratory-and-critical-care-medicine.csl +++ b/american-journal-of-respiratory-and-critical-care-medicine.csl @@ -2,6 +2,7 @@ diff --git a/bluebook-law-review.csl b/bluebook-law-review.csl index 7525b6b182e..0aa30af6bd5 100644 --- a/bluebook-law-review.csl +++ b/bluebook-law-review.csl @@ -187,11 +187,16 @@ - + + + + + + diff --git a/boletin-de-pediatria.csl b/boletin-de-pediatria.csl index 285d205f298..c54b4e7abe4 100644 --- a/boletin-de-pediatria.csl +++ b/boletin-de-pediatria.csl @@ -14,7 +14,7 @@ 0214-2597 Vancouver parentheses style strip periods for use in Boletín de Pediatría - 2017-08-05T15:23:08+00:00 + 2022-11-20T15:23:08+00:00 This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License @@ -257,7 +257,6 @@ - diff --git a/cambridge-university-press-author-date-cambridge-a.csl b/cambridge-university-press-author-date-cambridge-a.csl index a0db9d9521a..025f6b793ad 100644 --- a/cambridge-university-press-author-date-cambridge-a.csl +++ b/cambridge-university-press-author-date-cambridge-a.csl @@ -17,7 +17,7 @@ CambridgeA style required by Journal of Tropical Ecology as of December 2022. Modified from 'cambridge-university-press-author-date' (which seems now to be CambridgeB) by Eric Marcon - 2022-12-13T12:00:00+00:00 + 2022-12-21T12:00:00+00:00 This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License @@ -228,8 +228,7 @@ - diff --git a/cambridge-university-press-author-date.csl b/cambridge-university-press-author-date.csl index ae1df9beb63..1062acee2bf 100644 --- a/cambridge-university-press-author-date.csl +++ b/cambridge-university-press-author-date.csl @@ -220,7 +220,7 @@ - diff --git a/council-of-science-editors-author-date.csl b/council-of-science-editors-author-date.csl index 212ab9f1b0c..89e65bfd706 100644 --- a/council-of-science-editors-author-date.csl +++ b/council-of-science-editors-author-date.csl @@ -57,7 +57,7 @@ - + diff --git a/early-music-history.csl b/early-music-history.csl index 8244443043f..0cd8ae2d967 100644 --- a/early-music-history.csl +++ b/early-music-history.csl @@ -14,7 +14,7 @@ 0261-1279 1474-0559 - 2021-10-25T13:43:56+00:00 + 2022-12-01T08:32:54+00:00 This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License @@ -71,7 +71,7 @@ - + @@ -130,8 +130,8 @@ - - @@ -164,26 +164,30 @@ - - + + + + - + - - - + + + + + - + @@ -195,7 +199,7 @@ - + @@ -205,7 +209,7 @@ - + diff --git a/european-review-of-international-studies.csl b/european-review-of-international-studies.csl new file mode 100644 index 00000000000..adf51e54f6a --- /dev/null +++ b/european-review-of-international-studies.csl @@ -0,0 +1,873 @@ + + diff --git a/exploration-of-targeted-anti-tumor-therapy.csl b/exploration-of-targeted-anti-tumor-therapy.csl new file mode 100644 index 00000000000..6d2504ed4e0 --- /dev/null +++ b/exploration-of-targeted-anti-tumor-therapy.csl @@ -0,0 +1,328 @@ + + diff --git a/genetics-and-molecular-biology.csl b/genetics-and-molecular-biology.csl index f00bcacc0ef..e6572638554 100644 --- a/genetics-and-molecular-biology.csl +++ b/genetics-and-molecular-biology.csl @@ -125,7 +125,6 @@ - diff --git a/historical-materialism.csl b/historical-materialism.csl index 0d31db251cb..af403eab34a 100644 --- a/historical-materialism.csl +++ b/historical-materialism.csl @@ -13,7 +13,7 @@ 1465-4466 1569-206X - 2020-08-10T08:06:15+00:00 + 2022-11-10T15:25:15+00:00 This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License @@ -193,8 +193,16 @@ - - + + + + + + + + + + @@ -227,9 +235,6 @@ - - - @@ -245,7 +250,7 @@ - + @@ -269,8 +274,11 @@ - - + + + + + diff --git a/intellect-newgen-books.csl b/intellect-newgen-books.csl new file mode 100644 index 00000000000..fe669c6aedd --- /dev/null +++ b/intellect-newgen-books.csl @@ -0,0 +1,374 @@ + + diff --git a/journal-of-law-medicine-ethics.csl b/journal-of-law-medicine-ethics.csl new file mode 100644 index 00000000000..6eceea979c5 --- /dev/null +++ b/journal-of-law-medicine-ethics.csl @@ -0,0 +1,231 @@ + + diff --git a/molecular-oncology.csl b/molecular-oncology.csl index 600f255fa00..9efebab7363 100644 --- a/molecular-oncology.csl +++ b/molecular-oncology.csl @@ -4,8 +4,8 @@ Molecular Oncology http://www.zotero.org/styles/molecular-oncology - - + + Patrick O'Brien @@ -13,373 +13,75 @@ 1574-7891 1878-0261 - 2018-01-07T12:45:18+00:00 + 2022-12-28T20:25:53+00:00 This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License - - - - ed. & trans. - eds. & trans. - - trans. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - + - + - + - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + - - - - - - - + - - - - - - + + - - - + - + - - - - - - - - - - + + - - - - - - + @@ -392,215 +94,64 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - diff --git a/nys-nydanske-sprogstudier.csl b/nys-nydanske-sprogstudier.csl new file mode 100644 index 00000000000..7676cd59739 --- /dev/null +++ b/nys-nydanske-sprogstudier.csl @@ -0,0 +1,431 @@ + + diff --git a/polygraphia.csl b/polygraphia.csl new file mode 100644 index 00000000000..2964a76cba7 --- /dev/null +++ b/polygraphia.csl @@ -0,0 +1,240 @@ + + diff --git a/pravnik.csl b/pravnik.csl index 33592b3e994..71b74ee1f50 100644 --- a/pravnik.csl +++ b/pravnik.csl @@ -9,13 +9,13 @@ Oldrich Tristan Florian oldrich.florian@gmail.com - http://otristan.com + http://otflorian.com 0231-6625 Suitable for Právník - a journal published by the Institute of State and Law of the Czech Academy of Sciences. - 2021-03-07T10:00:00+00:00 + 2022-11-17T21:44:11+00:00 This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License @@ -153,7 +153,7 @@ - + @@ -175,7 +175,7 @@ - + @@ -232,7 +232,7 @@ - + @@ -357,7 +357,7 @@ - + @@ -487,7 +487,7 @@ - + diff --git a/san-francisco-estuary-and-watershed-science.csl b/san-francisco-estuary-and-watershed-science.csl index 94ed1374b38..c27caf10535 100644 --- a/san-francisco-estuary-and-watershed-science.csl +++ b/san-francisco-estuary-and-watershed-science.csl @@ -7,18 +7,18 @@ + Patrick O'Brien 1546-2366 - 2021-08-10T14:56:40+00:00 + 2022-12-29T17:07:36+00:00 This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License - edn. available from @@ -35,7 +35,7 @@ - + - - - - - + + - - - + + + - - - + + + + + + + + - + - - - - + + + + + + + + + + + + + + - + @@ -104,7 +117,7 @@ - @@ -128,11 +141,7 @@ - - - - - + @@ -151,7 +160,7 @@ - @@ -179,12 +188,10 @@ - - - - - - + + + + diff --git a/sciences-po-ecole-doctorale-author-date.csl b/sciences-po-ecole-doctorale-author-date.csl index 3fe5189cd70..6e408130c09 100644 --- a/sciences-po-ecole-doctorale-author-date.csl +++ b/sciences-po-ecole-doctorale-author-date.csl @@ -67,11 +67,16 @@ - - - - - + + + + + + + + + + @@ -136,7 +141,7 @@ - + @@ -158,9 +163,9 @@ - - - + + + @@ -177,7 +182,7 @@ - + @@ -191,7 +196,7 @@ - + @@ -214,7 +219,7 @@ - + @@ -277,6 +282,26 @@ + + + + + + + + + + + + + + + + + + diff --git a/sciences-po-ecole-doctorale-note-french.csl b/sciences-po-ecole-doctorale-note-french.csl index 6502c9e7cbb..9be3acd4153 100644 --- a/sciences-po-ecole-doctorale-note-french.csl +++ b/sciences-po-ecole-doctorale-note-french.csl @@ -58,11 +58,16 @@ - - - - - + + + + + + + + + + @@ -123,7 +128,7 @@ - + @@ -145,9 +150,9 @@ - - - + + + @@ -164,7 +169,7 @@ - + @@ -178,7 +183,7 @@ - + @@ -192,7 +197,7 @@ - + @@ -272,6 +277,26 @@ + + + + + + + + + + + + + + + + + + @@ -388,6 +413,7 @@ + diff --git a/smithsonian-institution-scholarly-press-author-date.csl b/smithsonian-institution-scholarly-press-author-date.csl index 37848b0f575..670546bf083 100644 --- a/smithsonian-institution-scholarly-press-author-date.csl +++ b/smithsonian-institution-scholarly-press-author-date.csl @@ -7,13 +7,14 @@ + Patrick O'Brien obrienpat86@gmail.com - 2017-08-03T15:31:00+00:00 + 2022-11-07T14:16:09+00:00 This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License @@ -35,7 +36,7 @@ @@ -59,7 +60,7 @@ - + @@ -517,7 +518,7 @@ - + @@ -597,7 +598,7 @@ - + diff --git a/smithsonian-institution-scholarly-press-note.csl b/smithsonian-institution-scholarly-press-note.csl index 935908fd437..c40aa04c46b 100644 --- a/smithsonian-institution-scholarly-press-note.csl +++ b/smithsonian-institution-scholarly-press-note.csl @@ -7,13 +7,14 @@ + Patrick O'Brien obrienpat86@gmail.com - 2018-04-24T15:30:08+00:00 + 2022-11-07T14:19:26+00:00 This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License @@ -103,7 +104,7 @@ @@ -232,7 +233,7 @@ - + @@ -265,7 +266,7 @@ - + diff --git a/theses-de-sorbonne-universite.csl b/theses-de-sorbonne-universite.csl new file mode 100644 index 00000000000..9088f55a551 --- /dev/null +++ b/theses-de-sorbonne-universite.csl @@ -0,0 +1,1599 @@ + + diff --git a/ucl-university-college-harvard.csl b/ucl-university-college-harvard.csl index 76ba867002b..d5a0ed2a044 100644 --- a/ucl-university-college-harvard.csl +++ b/ucl-university-college-harvard.csl @@ -18,7 +18,7 @@ ssha2@ucl.dk - 2021-02-10T05:28:52+00:00 + 2022-09-06T01:29:31+00:00 This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License @@ -389,8 +389,8 @@ Adds page number or other locator to citations. - +disambiguate-add-givenname="false" kan ændres til true hvis initialer skal med--> + diff --git a/vox-sanguinis.csl b/vox-sanguinis.csl index fe9537e4767..abc25511659 100644 --- a/vox-sanguinis.csl +++ b/vox-sanguinis.csl @@ -1,9 +1,9 @@ -