From 4b19ebb66b7d3e84f87084a9fe7f761fdcf7e7c6 Mon Sep 17 00:00:00 2001 From: rxlacroix Date: Fri, 18 Oct 2019 15:46:14 +0200 Subject: [PATCH 1/3] scroll longues citations --- R/leaflet.R | 2 +- data/authors.csv | 12 +++---- data/biblio.bib | 94 ++++++++++++++++++++++++------------------------ data/words.csv | 2 +- 4 files changed, 55 insertions(+), 55 deletions(-) diff --git a/R/leaflet.R b/R/leaflet.R index 4a87b49..99ce6fb 100644 --- a/R/leaflet.R +++ b/R/leaflet.R @@ -61,7 +61,7 @@ for (i in 1:length(words)){ } quotes$labelhtml <- paste0( - "
", + "
", "

", "« ",quotes$quote," »", "

", diff --git a/data/authors.csv b/data/authors.csv index a8c3d70..420fbc5 100644 --- a/data/authors.csv +++ b/data/authors.csv @@ -1,4 +1,5 @@ "author","location","lat","lng" +"Émile Zola","né à Paris (France)",48.856247,2.346691 "Agnès Martin-Lugand","née à Saint-Malo (France)",48.648741,-2.018459 "Alaa El Aswany","né au Caire (Egypte)",30.045963,31.236661 "Alain Damasio","né à Lyon (France)",45.762704,4.834096 @@ -11,8 +12,8 @@ "Amélie Nothomb","née à Etterbeek (Belgique)",50.832577,4.393031 "Amin Maalouf","né à Beyrouth (Liban)",33.895194,35.50274 "André Breton","né à Tinchebray (France)",48.764287,-0.729994 -"Antoine de Saint-Exupéry","né à Lyon (France)",45.762704,4.834096 "Antoine de Saint-Éxupéry","né à Lyon (France)",45.762704,4.834096 +"Antoine de Saint-Exupéry","né à Lyon (France)",45.762704,4.834096 "Anton Tchekhov","né à Taganrog (empire Russe)",47.243583,38.871747 "Arthur C. Clarke","né à Minehead (Royaume-Uni)",51.204278,-3.481126 "Arthur Conan Doyle","né à Édimbourg (Ecosse)",55.9525,-3.185398 @@ -38,17 +39,16 @@ "Elif Shafak","née à Strasbourg (France)",48.572485,7.750424 "Elizabeth Ann Scarborough","née à Kansas City (Missouri)",39.092327,-94.581216 "Elsa Morante","née à Rome (Italie)",41.903812,12.494097 -"Émile Zola","né à Paris (France)",48.856247,2.346691 "Emmanuel Bove","né à Paris (France)",48.856247,2.346691 "Emmanuel Kant","né à kaliningrad (Russie)",54.710745,20.505387 "Erik Orsenna","né à Paris (France)",48.856247,2.346691 "Ernest Cline","né à Ashland (Ohio)",40.860675,-82.311667 "Fiodor Dostoïevski","né à Moscou (Russie)",55.719473,37.62481 +"Frédéric Jaccaud","né à Lausanne (Suisse)",46.519472,6.633259 "François Bégaudeau","né à Luçon (France)",46.454626,-1.166092 "François Rabelais","né à Chinon (France)",47.169663,0.242912 "Franz Kafka","né à Prague (Autriche-Hongrie)",50.073196,14.438186 "Fred Vargas","née à Paris (France)",48.856247,2.346691 -"Frédéric Jaccaud","né à Lausanne (Suisse)",46.519472,6.633259 "Gabriel García Márquez","né à Aracataca (Colombie)",10.591039,-74.185502 "Gaston Leroux","né à Paris (France)",48.856247,2.346691 "George Orwell","né à Motihari (Inde)",26.646605,84.901736 @@ -70,7 +70,6 @@ "Italo Calvino","né à Santiago de las Vegas (Cuba)",22.970059,-82.38588 "Italo Svevo","né à Trieste (Italie)",45.648681,13.776447 "J. R. R. Tolkien","né à Bloemfontein (Afrique du Sud)",-29.10547,26.217024 -"Jean Giono","né à Manosque (France)",43.834982,5.788368 "Jean-Christophe Rufin","né à Bourges (France)",47.079864,2.401052 "Jean-Claude Izzo","né à Marseille (France)",43.295723,5.375723 "Jean-Jacques Rousseau","né à Genève (Suisse)",46.203712,6.143401 @@ -78,6 +77,7 @@ "Jean-Marie-Gustave Le Clézio"," né à Nice (France)",43.708352,7.265185 "Jean-Paul Sartre","né à Paris (France)",48.856247,2.346691 "Jean-Philippe Toussaint","né à Bruxelles (Belgique)",50.84866,4.349977 +"Jean Giono","né à Manosque (France)",43.834982,5.788368 "Jeanne Galzy","née à Montpellier (France)",43.610384,3.875192 "Jens Christian Grøndahl","né à Kongens Lyngby (Danemark)",55.780711,12.514997 "Jim Harrison","né à Grayling (Michigan)",44.66162,-84.71428 @@ -90,10 +90,10 @@ "Jules Romains","né à Saint-Julien-Chapteuil (France)",45.036,4.061799 "Jules Verne","né à Nantes (France)",47.216264,-1.554937 "Ken Kesey","né à La Junta (Colorado)",37.984697,-103.542807 -"Lauren Beukes","née à Johannesbourg (Afrique du Sud)",-26.206304,28.047259 -"Laurence Sterne","né à Clonmel (Irlande)",52.355615,-7.690746 "Léon Tolstoi","né à Iasnaïa Poliana (Empire russe)",54.114723,37.515467 "Léon Werth","né à Remiremont (France)",48.002256,6.581336 +"Lauren Beukes","née à Johannesbourg (Afrique du Sud)",-26.206304,28.047259 +"Laurence Sterne","né à Clonmel (Irlande)",52.355615,-7.690746 "Lewis Carroll","né à Daresbury (Royaume-Uni)",53.340912,-2.63303 "Liu Cixin","né à Yangquan (Chine)",37.859185,113.58284 "Lois McMaster Bujold","née à Columbus (Ohio)",39.961747,-82.999798 diff --git a/data/biblio.bib b/data/biblio.bib index ad93a24..4865beb 100644 --- a/data/biblio.bib +++ b/data/biblio.bib @@ -46,6 +46,20 @@ @Book{atwood2017servante publisher = {Robert Laffont}, } +@Book{begaudeau2007murs, + title = {Entre les murs}, + author = {Fran{\c c}ois B{\a'e}gaudeau}, + year = {2007}, + publisher = {Gallimard}, +} + +@Book{begaudeau2018guerre, + title = {En guerre}, + author = {Fran{\c c}ois B{\a'e}gaudeau}, + year = {2018}, + publisher = {Verticales}, +} + @Book{barbusse1921couteau, title = {Le Couteau entre les dents}, author = {Henri Barbusse}, @@ -101,20 +115,6 @@ @Book{beckett1952godot publisher = {Editions de minuit}, } -@Book{begaudeau2007murs, - title = {Entre les murs}, - author = {Fran{\c c}ois B{\a'e}gaudeau}, - year = {2007}, - publisher = {Gallimard}, -} - -@Book{begaudeau2018guerre, - title = {En guerre}, - author = {Fran{\c c}ois B{\a'e}gaudeau}, - year = {2018}, - publisher = {Verticales}, -} - @Book{benacquista1997saga, title = {Saga}, author = {Tonino Benacquista}, @@ -222,6 +222,13 @@ @Book{bussi2019licorne publisher = {Pocket}, } +@Book{celine1932voyage, + title = {Voyage au bout de la nuit}, + author = {Louis-Ferdinand C{\a'e}line}, + year = {1932}, + publisher = {Denoël et Steele}, +} + @Book{calvino1957baron, title = {Le Baron perché}, author = {Italo Calvino}, @@ -262,13 +269,6 @@ @Book{carroll1989oeuvres publisher = {Laffont}, } -@Book{celine1932voyage, - title = {Voyage au bout de la nuit}, - author = {Louis-Ferdinand C{\a'e}line}, - year = {1932}, - publisher = {Denoël et Steele}, -} - @Book{chalandon2008mon, title = {Mon traître}, author = {Sorj Chalandon}, @@ -288,6 +288,13 @@ @Book{cixin2004boule year = {2004}, } +@Book{clezio2015africain, + title = {L'Africain}, + author = {Jean-Marie-Gustave Le Cl{\a'e}zio}, + year = {2015}, + publisher = {Mercure de France}, +} + @Book{clarke1968odyssee, title = {2001 : l'Odyssée de l’espace}, author = {Arthur C. Clarke}, @@ -307,13 +314,6 @@ @Book{cleave2014collection year = {2014}, } -@Book{clezio2015africain, - title = {L'Africain}, - author = {Jean-Marie-Gustave Le Cl{\a'e}zio}, - year = {2015}, - publisher = {Mercure de France}, -} - @Book{cline2013player, title = {Player One}, author = {Ernest Cline}, @@ -521,6 +521,12 @@ @Book{erdrich2008malediction year = {2008}, } +@Book{feval1860tenebre, + title = {Le Chevalier Ténèbre}, + author = {Paul F{\a'e}val}, + year = {1860}, +} + @Book{fargues2011roman, title = {Le Roman de l'été}, author = {Nicolas Fargues}, @@ -535,12 +541,6 @@ @Book{farnel2017malicieuse publisher = {Fayard-Mazarine}, } -@Book{feval1860tenebre, - title = {Le Chevalier Ténèbre}, - author = {Paul F{\a'e}val}, - year = {1860}, -} - @Book{flanagan2013route, title = {La Route étroite vers le nord lointain}, author = {Richard Flanagan}, @@ -581,6 +581,12 @@ @Book{goscinny1960nicolas publisher = {Denoël}, } +@Book{grondahl2004piazza, + title = {Piazza Bucarest}, + author = {Jens Christian Gr{\o}ndahl}, + year = {2004}, +} + @Book{green2017margo, title = {La face cachée de Margo}, author = {John Green}, @@ -594,12 +600,6 @@ @Book{griffith1998belle year = {1998}, } -@Book{grondahl2004piazza, - title = {Piazza Bucarest}, - author = {Jens Christian Gr{\o}ndahl}, - year = {2004}, -} - @Book{grossman1980vie, title = {Vie et Destin}, author = {Vassili Grossman}, @@ -785,13 +785,6 @@ @Book{luciani2010brigade publisher = {Rageot}, } -@Book{maalouf1993rocher, - title = {Le rocher de Tanios}, - author = {Amin Maalouf}, - year = {1993}, - publisher = {Grasset}, -} - @Book{marquez1967solitude, title = {Cent ans de solitude}, author = {Gabriel Garc{\a'\i}a M{\a'a}rquez}, @@ -799,6 +792,13 @@ @Book{marquez1967solitude publisher = {Editorial Sudamericana}, } +@Book{maalouf1993rocher, + title = {Le rocher de Tanios}, + author = {Amin Maalouf}, + year = {1993}, + publisher = {Grasset}, +} + @Book{martinlugand2013gens, title = {Les gens heureux lisent et boivent du café}, author = {Agn{\a`e}s Martin-Lugand}, diff --git a/data/words.csv b/data/words.csv index bc0f4e1..09f648b 100644 --- a/data/words.csv +++ b/data/words.csv @@ -27,8 +27,8 @@ "l'atlas" "latitude" "longitude" -"mappemonde" "méridien" +"mappemonde" "parallèle" "plan" "plane" From bd0c03140e862cc81a33ebbac70282f6d82660e6 Mon Sep 17 00:00:00 2001 From: rxlacroix Date: Fri, 18 Oct 2019 15:50:02 +0200 Subject: [PATCH 2/3] Revert "scroll longues citations" This reverts commit 4b19ebb66b7d3e84f87084a9fe7f761fdcf7e7c6. --- R/leaflet.R | 2 +- data/authors.csv | 12 +++---- data/biblio.bib | 94 ++++++++++++++++++++++++------------------------ data/words.csv | 2 +- 4 files changed, 55 insertions(+), 55 deletions(-) diff --git a/R/leaflet.R b/R/leaflet.R index 99ce6fb..4a87b49 100644 --- a/R/leaflet.R +++ b/R/leaflet.R @@ -61,7 +61,7 @@ for (i in 1:length(words)){ } quotes$labelhtml <- paste0( - "
", + "
", "

", "« ",quotes$quote," »", "

", diff --git a/data/authors.csv b/data/authors.csv index 420fbc5..a8c3d70 100644 --- a/data/authors.csv +++ b/data/authors.csv @@ -1,5 +1,4 @@ "author","location","lat","lng" -"Émile Zola","né à Paris (France)",48.856247,2.346691 "Agnès Martin-Lugand","née à Saint-Malo (France)",48.648741,-2.018459 "Alaa El Aswany","né au Caire (Egypte)",30.045963,31.236661 "Alain Damasio","né à Lyon (France)",45.762704,4.834096 @@ -12,8 +11,8 @@ "Amélie Nothomb","née à Etterbeek (Belgique)",50.832577,4.393031 "Amin Maalouf","né à Beyrouth (Liban)",33.895194,35.50274 "André Breton","né à Tinchebray (France)",48.764287,-0.729994 -"Antoine de Saint-Éxupéry","né à Lyon (France)",45.762704,4.834096 "Antoine de Saint-Exupéry","né à Lyon (France)",45.762704,4.834096 +"Antoine de Saint-Éxupéry","né à Lyon (France)",45.762704,4.834096 "Anton Tchekhov","né à Taganrog (empire Russe)",47.243583,38.871747 "Arthur C. Clarke","né à Minehead (Royaume-Uni)",51.204278,-3.481126 "Arthur Conan Doyle","né à Édimbourg (Ecosse)",55.9525,-3.185398 @@ -39,16 +38,17 @@ "Elif Shafak","née à Strasbourg (France)",48.572485,7.750424 "Elizabeth Ann Scarborough","née à Kansas City (Missouri)",39.092327,-94.581216 "Elsa Morante","née à Rome (Italie)",41.903812,12.494097 +"Émile Zola","né à Paris (France)",48.856247,2.346691 "Emmanuel Bove","né à Paris (France)",48.856247,2.346691 "Emmanuel Kant","né à kaliningrad (Russie)",54.710745,20.505387 "Erik Orsenna","né à Paris (France)",48.856247,2.346691 "Ernest Cline","né à Ashland (Ohio)",40.860675,-82.311667 "Fiodor Dostoïevski","né à Moscou (Russie)",55.719473,37.62481 -"Frédéric Jaccaud","né à Lausanne (Suisse)",46.519472,6.633259 "François Bégaudeau","né à Luçon (France)",46.454626,-1.166092 "François Rabelais","né à Chinon (France)",47.169663,0.242912 "Franz Kafka","né à Prague (Autriche-Hongrie)",50.073196,14.438186 "Fred Vargas","née à Paris (France)",48.856247,2.346691 +"Frédéric Jaccaud","né à Lausanne (Suisse)",46.519472,6.633259 "Gabriel García Márquez","né à Aracataca (Colombie)",10.591039,-74.185502 "Gaston Leroux","né à Paris (France)",48.856247,2.346691 "George Orwell","né à Motihari (Inde)",26.646605,84.901736 @@ -70,6 +70,7 @@ "Italo Calvino","né à Santiago de las Vegas (Cuba)",22.970059,-82.38588 "Italo Svevo","né à Trieste (Italie)",45.648681,13.776447 "J. R. R. Tolkien","né à Bloemfontein (Afrique du Sud)",-29.10547,26.217024 +"Jean Giono","né à Manosque (France)",43.834982,5.788368 "Jean-Christophe Rufin","né à Bourges (France)",47.079864,2.401052 "Jean-Claude Izzo","né à Marseille (France)",43.295723,5.375723 "Jean-Jacques Rousseau","né à Genève (Suisse)",46.203712,6.143401 @@ -77,7 +78,6 @@ "Jean-Marie-Gustave Le Clézio"," né à Nice (France)",43.708352,7.265185 "Jean-Paul Sartre","né à Paris (France)",48.856247,2.346691 "Jean-Philippe Toussaint","né à Bruxelles (Belgique)",50.84866,4.349977 -"Jean Giono","né à Manosque (France)",43.834982,5.788368 "Jeanne Galzy","née à Montpellier (France)",43.610384,3.875192 "Jens Christian Grøndahl","né à Kongens Lyngby (Danemark)",55.780711,12.514997 "Jim Harrison","né à Grayling (Michigan)",44.66162,-84.71428 @@ -90,10 +90,10 @@ "Jules Romains","né à Saint-Julien-Chapteuil (France)",45.036,4.061799 "Jules Verne","né à Nantes (France)",47.216264,-1.554937 "Ken Kesey","né à La Junta (Colorado)",37.984697,-103.542807 -"Léon Tolstoi","né à Iasnaïa Poliana (Empire russe)",54.114723,37.515467 -"Léon Werth","né à Remiremont (France)",48.002256,6.581336 "Lauren Beukes","née à Johannesbourg (Afrique du Sud)",-26.206304,28.047259 "Laurence Sterne","né à Clonmel (Irlande)",52.355615,-7.690746 +"Léon Tolstoi","né à Iasnaïa Poliana (Empire russe)",54.114723,37.515467 +"Léon Werth","né à Remiremont (France)",48.002256,6.581336 "Lewis Carroll","né à Daresbury (Royaume-Uni)",53.340912,-2.63303 "Liu Cixin","né à Yangquan (Chine)",37.859185,113.58284 "Lois McMaster Bujold","née à Columbus (Ohio)",39.961747,-82.999798 diff --git a/data/biblio.bib b/data/biblio.bib index 4865beb..ad93a24 100644 --- a/data/biblio.bib +++ b/data/biblio.bib @@ -46,20 +46,6 @@ @Book{atwood2017servante publisher = {Robert Laffont}, } -@Book{begaudeau2007murs, - title = {Entre les murs}, - author = {Fran{\c c}ois B{\a'e}gaudeau}, - year = {2007}, - publisher = {Gallimard}, -} - -@Book{begaudeau2018guerre, - title = {En guerre}, - author = {Fran{\c c}ois B{\a'e}gaudeau}, - year = {2018}, - publisher = {Verticales}, -} - @Book{barbusse1921couteau, title = {Le Couteau entre les dents}, author = {Henri Barbusse}, @@ -115,6 +101,20 @@ @Book{beckett1952godot publisher = {Editions de minuit}, } +@Book{begaudeau2007murs, + title = {Entre les murs}, + author = {Fran{\c c}ois B{\a'e}gaudeau}, + year = {2007}, + publisher = {Gallimard}, +} + +@Book{begaudeau2018guerre, + title = {En guerre}, + author = {Fran{\c c}ois B{\a'e}gaudeau}, + year = {2018}, + publisher = {Verticales}, +} + @Book{benacquista1997saga, title = {Saga}, author = {Tonino Benacquista}, @@ -222,13 +222,6 @@ @Book{bussi2019licorne publisher = {Pocket}, } -@Book{celine1932voyage, - title = {Voyage au bout de la nuit}, - author = {Louis-Ferdinand C{\a'e}line}, - year = {1932}, - publisher = {Denoël et Steele}, -} - @Book{calvino1957baron, title = {Le Baron perché}, author = {Italo Calvino}, @@ -269,6 +262,13 @@ @Book{carroll1989oeuvres publisher = {Laffont}, } +@Book{celine1932voyage, + title = {Voyage au bout de la nuit}, + author = {Louis-Ferdinand C{\a'e}line}, + year = {1932}, + publisher = {Denoël et Steele}, +} + @Book{chalandon2008mon, title = {Mon traître}, author = {Sorj Chalandon}, @@ -288,13 +288,6 @@ @Book{cixin2004boule year = {2004}, } -@Book{clezio2015africain, - title = {L'Africain}, - author = {Jean-Marie-Gustave Le Cl{\a'e}zio}, - year = {2015}, - publisher = {Mercure de France}, -} - @Book{clarke1968odyssee, title = {2001 : l'Odyssée de l’espace}, author = {Arthur C. Clarke}, @@ -314,6 +307,13 @@ @Book{cleave2014collection year = {2014}, } +@Book{clezio2015africain, + title = {L'Africain}, + author = {Jean-Marie-Gustave Le Cl{\a'e}zio}, + year = {2015}, + publisher = {Mercure de France}, +} + @Book{cline2013player, title = {Player One}, author = {Ernest Cline}, @@ -521,12 +521,6 @@ @Book{erdrich2008malediction year = {2008}, } -@Book{feval1860tenebre, - title = {Le Chevalier Ténèbre}, - author = {Paul F{\a'e}val}, - year = {1860}, -} - @Book{fargues2011roman, title = {Le Roman de l'été}, author = {Nicolas Fargues}, @@ -541,6 +535,12 @@ @Book{farnel2017malicieuse publisher = {Fayard-Mazarine}, } +@Book{feval1860tenebre, + title = {Le Chevalier Ténèbre}, + author = {Paul F{\a'e}val}, + year = {1860}, +} + @Book{flanagan2013route, title = {La Route étroite vers le nord lointain}, author = {Richard Flanagan}, @@ -581,12 +581,6 @@ @Book{goscinny1960nicolas publisher = {Denoël}, } -@Book{grondahl2004piazza, - title = {Piazza Bucarest}, - author = {Jens Christian Gr{\o}ndahl}, - year = {2004}, -} - @Book{green2017margo, title = {La face cachée de Margo}, author = {John Green}, @@ -600,6 +594,12 @@ @Book{griffith1998belle year = {1998}, } +@Book{grondahl2004piazza, + title = {Piazza Bucarest}, + author = {Jens Christian Gr{\o}ndahl}, + year = {2004}, +} + @Book{grossman1980vie, title = {Vie et Destin}, author = {Vassili Grossman}, @@ -785,13 +785,6 @@ @Book{luciani2010brigade publisher = {Rageot}, } -@Book{marquez1967solitude, - title = {Cent ans de solitude}, - author = {Gabriel Garc{\a'\i}a M{\a'a}rquez}, - year = {1967}, - publisher = {Editorial Sudamericana}, -} - @Book{maalouf1993rocher, title = {Le rocher de Tanios}, author = {Amin Maalouf}, @@ -799,6 +792,13 @@ @Book{maalouf1993rocher publisher = {Grasset}, } +@Book{marquez1967solitude, + title = {Cent ans de solitude}, + author = {Gabriel Garc{\a'\i}a M{\a'a}rquez}, + year = {1967}, + publisher = {Editorial Sudamericana}, +} + @Book{martinlugand2013gens, title = {Les gens heureux lisent et boivent du café}, author = {Agn{\a`e}s Martin-Lugand}, diff --git a/data/words.csv b/data/words.csv index 09f648b..bc0f4e1 100644 --- a/data/words.csv +++ b/data/words.csv @@ -27,8 +27,8 @@ "l'atlas" "latitude" "longitude" -"méridien" "mappemonde" +"méridien" "parallèle" "plan" "plane" From bcbe7ab5434983911e59b13e611e5fea040c148d Mon Sep 17 00:00:00 2001 From: rxlacroix Date: Fri, 18 Oct 2019 15:55:07 +0200 Subject: [PATCH 3/3] scroll citations longues --- R/leaflet.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R/leaflet.R b/R/leaflet.R index 4a87b49..99ce6fb 100644 --- a/R/leaflet.R +++ b/R/leaflet.R @@ -61,7 +61,7 @@ for (i in 1:length(words)){ } quotes$labelhtml <- paste0( - "
", + "
", "

", "« ",quotes$quote," »", "

",