diff -r e8faf97d2a40 -r 2e1053dff5f2 player/data/rigoletto.json
--- a/player/data/rigoletto.json	Wed May 29 17:05:34 2013 +0200
+++ b/player/data/rigoletto.json	Thu May 30 18:47:48 2013 +0200
@@ -252,8 +252,7 @@
                     "id-ref": "tag-duc-de-mantoue"
                 }, {
                     "id-ref": "tag-gilda"
-                },
-                {
+                }, {
                     "id-ref": "tag-air"
                 }
             ],
@@ -317,7 +316,7 @@
                 ]
             },
             "begin": 80000,
-            "end": 200000,
+            "end": 100000,
             "media": "media-01",
             "meta": {
                 "dc:contributor": "perso",
@@ -337,7 +336,7 @@
                 "url": "http://www.iri.centrepompidou.fr/dev/~veltr/mashup/moon/melies.webm"
             },
             "begin": 200000,
-            "end": 320000,
+            "end": 220000,
             "media": "media-01",
             "meta": {
                 "dc:contributor": "perso",
@@ -352,12 +351,12 @@
             "content": {
                 "mimetype": "application/x-ldt-video",
                 "description": "Giuseppe Verdi\nRigoletto\nDirected by Jean-Pierre Ponnelle\n1982\nVienna Philharmonic Orchestra and Vienna State Opera Chorus\nConductor: Riccardo Chailly\nRigoletto: Ingvar Wixell\nDuke of Mantua: Luciano Pavarotti\nGilda: Edita Gruberova\nSparafucile: Ferruccio Furlanetto\nMaddalena: Victoria Vergara",
-                "title": "Cortigiani vil razza sur Youtube",
+                "title": "Povero Rigoletto sur Youtube",
                 "autostart": true,
                 "url": "http://youtu.be/JULs5RoCEgM?t=3m36s"
             },
             "begin": 20000,
-            "end": 140000,
+            "end": 40000,
             "media": "media-01",
             "meta": {
                 "dc:contributor": "perso",
@@ -369,18 +368,20 @@
             "tags": [
                 {
                     "id-ref": "tag-giuseppe-verdi"
-                },
-                {
+                }, {
                     "id-ref": "tag-air"
                 }, {
                     "id-ref": "tag-rigoletto"
-                }],
+                }
+            ],
             "id": "annotation-08"
         }, {
             "content": {
-                "mimetype": "application/x-ldt-structured",
-                "description": "Ceci est un exemple d'annotation basique, n'utilisant pas les nouveaux types définis pour Aix.",
-                "title": "Annotation basique (LDT-Structured)"
+                "mimetype": "application/x-ldt-text",
+                "description": "",
+                "title": "Annotation texte non-formaté",
+                "markup": "text",
+                "text": "Ceci est un exemple d'annotation texte basique, n'utilisant pas de balisage HTML."
             },
             "begin": 40000,
             "meta": {
@@ -390,7 +391,7 @@
                 "dc:modified": "2012-05-07T10:11:06.721324",
                 "dc:creator": "perso"
             },
-            "end": 160000,
+            "end": 60000,
             "tags": [],
             "color": "3355443",
             "media": "media-01",
@@ -404,7 +405,7 @@
                 "text": "<h2>Sous-titre de niveau 2 de l'annotation enrichie</h2><h3>Sous-titre de niveau 3 de l'annotation enrichie</h3><p>Paragraphe de l'annotation enrichie</p><p>Autre paragraphe de l'annotation enrichie</p><h4>Sous-titre de niveau 4 de l'annotation en texte enrichi</h4><p>Un paragraphe avec des balises <strong>strong</strong>, <em>em</em>, <i>i</i>, <u>u</u> et <b>b</b></p><ul><li>Element de liste</li><li>Element de liste</li></ul><ol><li>Element de liste</li><li>Element de liste</li></ol><p>Paragraphe avec un lien vers <a href='http://www.wikipedia.org/'>Wikipédia</a></p>"
             },
             "begin": 70000,
-            "end": 190000,
+            "end": 90000,
             "media": "media-01",
             "meta": {
                 "dc:contributor": "perso",
@@ -446,10 +447,10 @@
             "tags": [
                 {
                     "id-ref": "tag-giuseppe-verdi"
-                },
-                {
+                }, {
                     "id-ref": "victor-hugo"
-                }],
+                }
+            ],
             "id": "annotation-11"
         }, {
             "content": {
@@ -460,7 +461,7 @@
                 "url": "http://www.iri.centrepompidou.fr/wp-content/uploads/2012/01/CitationCocteau.mp3"
             },
             "begin": 250000,
-            "end": 340000,
+            "end": 270000,
             "media": "media-01",
             "meta": {
                 "dc:contributor": "perso",
@@ -480,7 +481,7 @@
                 "url": "https://soundcloud.com/dimitri-platanias/cortigiani-rigoletto-verdi"
             },
             "begin": 110000,
-            "end": 230000,
+            "end": 130000,
             "media": "media-01",
             "meta": {
                 "dc:contributor": "perso",
@@ -489,7 +490,13 @@
                 "dc:modified": "2012-05-07T10:11:06.721324",
                 "dc:creator": "perso"
             },
-            "tags": [],
+            "tags": [
+                {
+                    "id-ref": "tag-air"
+                }, {
+                    "id-ref": "tag-rigoletto"
+                }
+            ],
             "id": "annotation-13"
         }, {
             "content": {
@@ -500,7 +507,7 @@
                 "url": "http://vimeo.com/23268865"
             },
             "begin": 160000,
-            "end": 280000,
+            "end": 180000,
             "media": "media-01",
             "meta": {
                 "dc:contributor": "perso",
@@ -509,7 +516,13 @@
                 "dc:modified": "2012-05-07T10:11:06.721324",
                 "dc:creator": "perso"
             },
-            "tags": [],
+            "tags": [
+                {
+                    "id-ref": "tag-air"
+                }, {
+                    "id-ref": "tag-rigoletto"
+                }
+            ],
             "id": "annotation-14"
         }, {
             "content": {
@@ -520,7 +533,7 @@
                 "url": "http://www.dailymotion.com/video/xgs10f_the-three-tenors-la-donna-e-mobile_music"
             },
             "begin": 180000,
-            "end": 300000,
+            "end": 200000,
             "media": "media-01",
             "meta": {
                 "dc:contributor": "perso",
@@ -529,7 +542,13 @@
                 "dc:modified": "2012-05-07T10:11:06.721324",
                 "dc:creator": "perso"
             },
-            "tags": [],
+            "tags": [
+                {
+                    "id-ref": "tag-air"
+                }, {
+                    "id-ref": "tag-duc-de-mantoue"
+                }
+            ],
             "id": "annotation-15"
         }, {
             "content": {
@@ -547,7 +566,7 @@
                 ]
             },
             "begin": 260000,
-            "end": 340000,
+            "end": 280000,
             "media": "media-01",
             "meta": {
                 "dc:contributor": "perso",
@@ -556,7 +575,11 @@
                 "dc:modified": "2012-05-07T10:11:06.721324",
                 "dc:creator": "perso"
             },
-            "tags": [],
+            "tags": [
+                {
+                    "id-ref": "giuseppe-verdi"
+                }
+            ],
             "id": "annotation-16"
         }
     ],