From 151693fd9739efb1b4cde402482a0e71e6707fd0 Mon Sep 17 00:00:00 2001
From: GodsQuantum <193283917+GodsQuantum@users.noreply.github.com>
Date: Fri, 18 Sep 2026 09:39:19 +0200
Subject: [PATCH] feat: add short-form punctuation cleanup and word-by-word
 captions

---
 CHANGELOG.md                                  |  12 ++
 Cargo.lock                                    |   2 +-
 Cargo.toml                                    |   2 +-
 README.fr.md                                  |   6 +-
 README.md                                     |   6 +-
 frontend/package-lock.json                    |   4 +-
 frontend/package.json                         |   2 +-
 .../src/lib/components/FormatPreview.svelte   |  18 +-
 frontend/src/lib/i18n.ts                      |   8 +-
 frontend/src/lib/preview.js                   |  24 +++
 frontend/src/lib/subtitle-edit.js             |  17 ++
 frontend/src/lib/types.ts                     |   2 +-
 frontend/src/lib/views/EditorView.svelte      |  23 ++-
 frontend/src/lib/views/PresetsView.svelte     |   2 +-
 frontend/tests/integration-docs.test.mjs      |   8 +-
 frontend/tests/preview.test.mjs               |  18 +-
 frontend/tests/subtitle-edit.test.mjs         |  24 +++
 src/domain.rs                                 |   1 +
 src/subtitle/ass.rs                           | 170 +++++++++++++++++-
 19 files changed, 309 insertions(+), 40 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fd0a9ff..2653a30 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,18 @@ All notable released changes are documented here. AutoSubs follows semantic vers
 
 ## [Unreleased]
 
+## [3.2.0] - 2026-09-18
+
+### Added
+
+- New **Word by word** caption animation: only the currently spoken unit is displayed, using canonical word timings.
+- Word-by-word grouping keeps French elisions and split compounds together (for example `l'` + `amour` and `rendez-` + `vous`) instead of flashing orphan fragments.
+- Editor action to remove sentence-ending full stops in one pass while preserving commas, `!`, `?`, and ellipses, with a one-step undo before saving.
+
+### Changed
+
+- Preset and live video previews now mirror the word-by-word grouping used by the ASS/libass renderer.
+
 ## [3.1.2] - 2026-09-17
 
 ### Fixed
diff --git a/Cargo.lock b/Cargo.lock
index 8f53ce2..ecd839a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -97,7 +97,7 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
 [[package]]
 name = "autosubs"
-version = "3.1.2"
+version = "3.2.0"
 dependencies = [
  "anyhow",
  "async-stream",
diff --git a/Cargo.toml b/Cargo.toml
index 831863b..2b4d4b3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "autosubs"
-version = "3.1.2"
+version = "3.2.0"
 edition = "2024"
 rust-version = "1.98"
 authors = ["GodsQuantum"]
diff --git a/README.fr.md b/README.fr.md
index 85815db..289ce8c 100644
--- a/README.fr.md
+++ b/README.fr.md
@@ -47,8 +47,8 @@ Le navigateur n'est pas le moteur métier. Rust possède la normalisation des ti
 - **Correction LLM optionnelle** — orthographe et ponctuation sans laisser le modèle modifier directement les timings.
 - **Un seul moteur de timing** — Rust répare plages invalides, chevauchements, gaps et timings de mots. Le frontend ne possède pas une deuxième implémentation divergente.
 - **Découpage Unicode/français** — comptage par graphèmes, opportunités Unicode et règles de non-coupure françaises.
-- **Styles ASS/libass** — Pop, Surbrillance, Rebond, Karaoké, Fondu, Slide-up ou aucun effet; polices, contour, ombre, position et couleur d'accent.
-- **Timings mot-à-mot durables** — la timeline canonique survit aux regroupements et modifications visuelles ; les animations utilisent les timings originaux.
+- **Styles ASS/libass** — Pop, Surbrillance, Rebond, Karaoké, **Mot par mot**, Fondu, Slide-up ou aucun effet; polices, contour, ombre, position et couleur d'accent.
+- **Timings mot-à-mot durables** — la timeline canonique survit aux regroupements et modifications visuelles ; les animations utilisent les timings originaux. Le mode Mot par mot garde les élisions (`l'` + mot) et mots composés avec tiret dans une seule unité visuelle.
 - **Mise en page française** — segmentation syntaxique française et `maxLines` strict garantissent des retours explicites sans ligne cachée supplémentaire.
 - **Cycle de vie complet** — édition, scission, fusion, suppression, retranscription et rerendu depuis la file et l'éditeur. Supprimer un job conserve la source et la sortie finale.
 - **Invariant Source** — Source + Conserver préserve la géométrie primaire sans scale, pad, crop ni bandes noires.
@@ -122,7 +122,7 @@ volumes:
 3. La correction LLM optionnelle ne touche qu'au texte.
 4. Le moteur Rust normalise timings et regroupement.
 5. Le job arrive à **Prêt**. Aucun encodage vidéo n'a encore été dépensé si le rendu immédiat n'a pas été demandé.
-6. Corrige/scinde/fusionne/supprime/recherche/remplace/regroupe/décale dans l'Éditeur ; la timeline canonique reste disponible pour les regroupements ultérieurs.
+6. Corrige/scinde/fusionne/supprime/recherche/remplace/regroupe/décale dans l'Éditeur. **Supprimer les points finaux** nettoie en lot les captions short-form tout en conservant virgules, !, ?, et points de suspension ; l'action peut être annulée avant enregistrement. La timeline canonique reste disponible pour les regroupements ultérieurs.
 7. Exporte SRT/ASS/JSON sans réencoder, ou lance **Rendre la vidéo**.
 8. FFmpeg/libass écrit d'abord un staging `.partial`. `.partial` est strictement interne au média incomplet, jamais un format de sous-titres.
 9. Vidéo et sidecars sont publiés ensemble ; l'archive éventuelle de la source arrive en dernier. Les jobs existants peuvent être retranscrits ou rerendus depuis la file.
diff --git a/README.md b/README.md
index 0db9672..1638f92 100644
--- a/README.md
+++ b/README.md
@@ -47,8 +47,8 @@ It is deliberately not a browser-only subtitle toy. The Rust backend owns timing
 - **Optional LLM correction** — spelling/punctuation correction after import/transcription while preserving line count and timings.
 - **Canonical subtitle timing engine** — one Rust implementation repairs invalid ranges, overlaps, gaps and word timings. The browser does not maintain a competing copy.
 - **Unicode-aware line grouping** — grapheme counting, Unicode line-break opportunities and French no-break rules instead of UTF-8 byte counting.
-- **ASS/libass styling** — Pop, Highlight, Bounce, Karaoke, Fade, Slide-up and plain subtitle modes; custom fonts, outline, shadow, placement and highlight colors.
-- **Durable word timing** — the canonical word-by-word timeline survives regrouping and visual edits; timed animations use the original word timings.
+- **ASS/libass styling** — Pop, Highlight, Bounce, Karaoke, **Word by word**, Fade, Slide-up and plain subtitle modes; custom fonts, outline, shadow, placement and highlight colors.
+- **Durable word timing** — the canonical word-by-word timeline survives regrouping and visual edits; timed animations use the original word timings. Word-by-word display keeps apostrophe prefixes and split hyphen compounds attached to their word.
 - **French-safe visual layout** — French syntax-aware segmentation and hard `maxLines` enforcement use explicit line breaks, so rendered captions never gain hidden extra lines.
 - **Complete job lifecycle** — edit, split, merge, delete, retranscribe and re-render jobs from the queue/editor. Deleting a job keeps its source and final output files.
 - **Source geometry invariant** — Source + Preserve keeps the primary video dimensions and aspect ratio without scale, pad, crop, or black bars.
@@ -136,7 +136,7 @@ For migration, the old `SPEACHES_URL` variable is still accepted as a first-boot
 3. Optional LLM correction runs on text only.
 4. The canonical Rust engine normalizes timings and grouping.
 5. The job reaches **Ready**. Nothing has been re-encoded yet unless you explicitly chose immediate render.
-6. Review/edit/split/merge/delete/search/replace/regroup/shift timings in Editor. The canonical word timeline remains available for later regrouping.
+6. Review/edit/split/merge/delete/search/replace/regroup/shift timings in Editor. Use **Remove final periods** for short-form caption cleanup; it preserves commas, !, ?, and ellipses and can be undone before saving. The canonical word timeline remains available for later regrouping.
 7. Export SRT/ASS/JSON without touching the video, or click **Render video**.
 8. FFmpeg/libass renders to a `.partial` staging file. `.partial` is internal media staging and is never treated as a subtitle file.
 9. Video and sidecars publish together; an optional source archive happens last. Existing jobs can be retranscribed or re-rendered from the queue.
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index bd8dc5b..284b8a7 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "autosubs-frontend",
-  "version": "3.1.2",
+  "version": "3.2.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "autosubs-frontend",
-      "version": "3.1.2",
+      "version": "3.2.0",
       "devDependencies": {
         "@sveltejs/adapter-static": "3.0.10",
         "@sveltejs/kit": "2.70.3",
diff --git a/frontend/package.json b/frontend/package.json
index 01409dc..9ddcdc8 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,7 +1,7 @@
 {
   "name": "autosubs-frontend",
   "private": true,
-  "version": "3.1.2",
+  "version": "3.2.0",
   "type": "module",
   "scripts": {
     "dev": "vite dev",
diff --git a/frontend/src/lib/components/FormatPreview.svelte b/frontend/src/lib/components/FormatPreview.svelte
index 8066ec3..25b698c 100644
--- a/frontend/src/lib/components/FormatPreview.svelte
+++ b/frontend/src/lib/components/FormatPreview.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { onMount } from 'svelte';
   import type { FontFace, FormatProfile, Preset, SubtitleWord } from '$lib/types';
-  import { activeWordIndex, customFontMatch, clampPreviewPosition, demoSubtitleWords, formatRatio, karaokeProgress, loopedPreviewTime, previewSubtitleTokens, previewWidthForRatio, safeZoneGuide, subtitlePositionBounds, scalePreviewMetric, videoObjectFit } from '$lib/preview.js';
+  import { activeWordIndex, customFontMatch, clampPreviewPosition, demoSubtitleWords, formatRatio, karaokeProgress, loopedPreviewTime, previewSubtitleTokens, wordByWordPreviewTokens, previewWidthForRatio, safeZoneGuide, subtitlePositionBounds, scalePreviewMetric, videoObjectFit } from '$lib/preview.js';
 
   type SafeZoneKey = 'off'|'generic'|'tiktok'|'reels'|'shorts';
 
@@ -67,17 +67,19 @@
   $: renderedItalic = selectedFace?.italic ?? Boolean(p?.italic);
   $: timedWords = words?.length ? words : demoSubtitleWords(text).map(word=>({...word,start:word.start*demoDuration,end:word.end*demoDuration}));
   $: renderedFamily = selectedFace?.fullName ?? selectedFace?.family ?? p?.fontFamily.split(',')[0].trim() ?? "sans-serif";
-  $: previewWords = previewSubtitleTokens(text, timedWords);
+  $: animation = p?.animationStyle ?? 'none';
+  $: rawPreviewWords = previewSubtitleTokens(text, timedWords);
+  $: previewWords = animation === 'word-by-word' ? wordByWordPreviewTokens(rawPreviewWords) : rawPreviewWords;
   $: previewTime = videoSrc ? currentTime : loopedPreviewTime(demoElapsed,demoDuration);
   $: activeWord = activeWordIndex(previewWords, previewTime);
-  $: animation = p?.animationStyle ?? 'none';
   $: eventTime = Math.max(0, previewTime - (previewWords[0]?.start ?? 0));
   $: wobbleDuration = 1 / Math.max(0.05, Number(p?.wobbleSpeed) || 1);
   $: motionStyle = `--preview-time:${previewTime};--event-time:${eventTime};--wobble-duration:${wobbleDuration}s;`;
   $: fontSize = p ? scalePreviewMetric(p.size,displayHeight) : 18;
   $: lineHeight = 1.08;
-  $: visualLines = Math.max(1, text.split('\n').filter(line=>line.trim()).length);
-  $: longestLine = Math.max(1, ...text.split('\n').map(line=>Array.from(line).length));
+  $: layoutText = animation === 'word-by-word' ? (previewWords[activeWord]?.word ?? text) : text;
+  $: visualLines = Math.max(1, layoutText.split('\n').filter(line=>line.trim()).length);
+  $: longestLine = Math.max(1, ...layoutText.split('\n').map(line=>Array.from(line).length));
   $: estimatedBlockWidth = Math.min(displayWidth * .9, longestLine * fontSize * .56);
   $: estimatedBlockHeight = visualLines * fontSize + Math.max(0,visualLines-1) * scalePreviewMetric(p?.lineSpacing ?? 0,displayHeight);
   $: positionBounds = subtitlePositionBounds(displayWidth, displayHeight, estimatedBlockWidth, estimatedBlockHeight);
@@ -203,9 +205,9 @@
         on:pointerup={stopDrag}
         on:pointercancel={stopDrag}
         on:keydown={nudgePosition}
-      ><span class:floating={p?.floating} class="preview-floating" style={motionStyle}><span class={`preview-animation-inner animation-${animation}`} style={motionStyle}>{#each previewWords as word, i}{#if word.separator}<span aria-hidden="true">{word.separator}</span>{/if}<span class:active={i === activeWord} class={`preview-word word-animation-${animation}`} style={`${motionStyle}--word-time:${Math.max(0,previewTime-word.start)};--base-color:${p?.baseColor ?? '#fff'};--highlight-color:${p?.highlightColor ?? '#3dd7cf'};--karaoke-progress:${karaokeProgress(previewTime,word.start,word.end)}%;color:${i === activeWord && (animation === 'pop' || animation === 'highlight' || animation === 'bounce' || animation === 'karaoke') ? (p?.highlightColor ?? '#3dd7cf') : (p?.baseColor ?? '#fff')}`}>{word.word}</span>{/each}</span></span></button>
+      ><span class:floating={p?.floating} class="preview-floating" style={motionStyle}><span class={`preview-animation-inner animation-${animation}`} style={motionStyle}>{#each previewWords as word, i}{#if animation !== 'word-by-word' || i === activeWord}{#if animation !== 'word-by-word' && word.separator}<span aria-hidden="true">{word.separator}</span>{/if}<span class:active={i === activeWord} class={`preview-word word-animation-${animation}`} style={`${motionStyle}--word-time:${Math.max(0,previewTime-word.start)};--base-color:${p?.baseColor ?? '#fff'};--highlight-color:${p?.highlightColor ?? '#3dd7cf'};--karaoke-progress:${karaokeProgress(previewTime,word.start,word.end)}%;color:${i === activeWord && (animation === 'pop' || animation === 'highlight' || animation === 'bounce' || animation === 'karaoke') ? (p?.highlightColor ?? '#3dd7cf') : (p?.baseColor ?? '#fff')}`}>{word.word}</span>{/if}{/each}</span></span></button>
     {:else}
-      <div class="preview-subtitle" style={subtitleStyle}><span class:floating={p?.floating} class="preview-floating" style={motionStyle}><span class={`preview-animation-inner animation-${animation}`} style={motionStyle}>{#each previewWords as word, i}{#if word.separator}<span aria-hidden="true">{word.separator}</span>{/if}<span class:active={i === activeWord} class={`preview-word word-animation-${animation}`} style={`${motionStyle}--word-time:${Math.max(0,previewTime-word.start)};--base-color:${p?.baseColor ?? '#fff'};--highlight-color:${p?.highlightColor ?? '#3dd7cf'};--karaoke-progress:${karaokeProgress(previewTime,word.start,word.end)}%;color:${i === activeWord && (animation === 'pop' || animation === 'highlight' || animation === 'bounce' || animation === 'karaoke') ? (p?.highlightColor ?? '#3dd7cf') : (p?.baseColor ?? '#fff')}`}>{word.word}</span>{/each}</span></span></div>
+      <div class="preview-subtitle" style={subtitleStyle}><span class:floating={p?.floating} class="preview-floating" style={motionStyle}><span class={`preview-animation-inner animation-${animation}`} style={motionStyle}>{#each previewWords as word, i}{#if animation !== 'word-by-word' || i === activeWord}{#if animation !== 'word-by-word' && word.separator}<span aria-hidden="true">{word.separator}</span>{/if}<span class:active={i === activeWord} class={`preview-word word-animation-${animation}`} style={`${motionStyle}--word-time:${Math.max(0,previewTime-word.start)};--base-color:${p?.baseColor ?? '#fff'};--highlight-color:${p?.highlightColor ?? '#3dd7cf'};--karaoke-progress:${karaokeProgress(previewTime,word.start,word.end)}%;color:${i === activeWord && (animation === 'pop' || animation === 'highlight' || animation === 'bounce' || animation === 'karaoke') ? (p?.highlightColor ?? '#3dd7cf') : (p?.baseColor ?? '#fff')}`}>{word.word}</span>{/if}{/each}</span></span></div>
     {/if}
   {/if}
 </div>
@@ -232,7 +234,7 @@
   .word-animation-pop.active { animation:preview-pop .32s ease both; animation-delay:calc(var(--word-time) * -1s); animation-play-state:paused; }
   .word-animation-bounce.active { animation:preview-bounce .38s ease both; animation-delay:calc(var(--word-time) * -1s); animation-play-state:paused; }
   .word-animation-karaoke.active { color:transparent !important; background:linear-gradient(90deg,var(--highlight-color) 0 var(--karaoke-progress),var(--base-color) var(--karaoke-progress)); background-clip:text; -webkit-background-clip:text; }
-  .animation-highlight, .animation-karaoke, .animation-none { animation:none; }
+  .animation-highlight, .animation-karaoke, .animation-word-by-word, .animation-none { animation:none; }
   @keyframes preview-fade { from { opacity:0; } to { opacity:1; } }
   @keyframes preview-slide-up { from { opacity:0; transform:translateY(18px); } to { opacity:1; transform:translateY(0); } }
   @keyframes preview-pop { 0% { transform:scale(1); } 43% { transform:scale(1.12); } 100% { transform:scale(1); } }
diff --git a/frontend/src/lib/i18n.ts b/frontend/src/lib/i18n.ts
index 1a78889..073bd82 100644
--- a/frontend/src/lib/i18n.ts
+++ b/frontend/src/lib/i18n.ts
@@ -8,7 +8,7 @@ const en = {
   uploadQueue:'Upload queue', uploadProgress:'Upload progress', noJobs:'No jobs yet', noJobsHint:'Drop a video or choose files to start.', edit:'Edit', render:'Render', renderVideo:'Render video', downloadVideo:'Download video', cancel:'Cancel', retry:'Retry', prepare:'Prepare',
   source:'Source', status:'Status', progress:'Progress', output:'Output', error:'Error', updated:'Updated', sidecar:'Sidecar', none:'None', created:'Created',
   save:'Save', saved:'Saved', delete:'Delete', split:'Split', mergePrevious:'Merge previous', mergeNext:'Merge next', retranscribe:'Retranscribe', reRender:'Re-render', create:'Create', close:'Close', select:'Select', browse:'Browse', back:'Back', refresh:'Refresh', new:'New', duplicate:'Duplicate',
-  videoPreview:'Video preview', subtitles:'Subtitles', search:'Search', replace:'Replace', replaceAll:'Replace all', shift:'Shift', milliseconds:'ms', seconds:'seconds',
+  videoPreview:'Video preview', subtitles:'Subtitles', search:'Search', replace:'Replace', replaceAll:'Replace all', removeFinalPeriods:'Remove final periods', undoPunctuation:'Undo punctuation cleanup', finalPeriodsRemoved:'Final periods removed', shift:'Shift', milliseconds:'ms', seconds:'seconds',
   regroup:'Regroup', maxChars:'Max chars / line', maxLines:'Max lines', export:'Export', exportSrt:'SRT', exportAss:'ASS', exportJson:'JSON', timingRepair:'Timing repair', timingRepairHint:'The backend normalizes overlaps and word timing when you save.',
   repairedOverlaps:'Repaired overlaps', retimedLines:'Retimed word lines', droppedEmpty:'Dropped empty lines', currentTime:'Current time', jumpToLine:'Jump to line',
   attachedSidecar:'Attached sidecar', attachFile:'Upload sidecar', chooseServerFile:'Choose server file', removeSidecar:'Remove sidecar', replaceSidecar:'Replace sidecar',
@@ -35,7 +35,7 @@ const en = {
   typography:'Typography', placement:'Placement', segmentation:'Segmentation', styling:'Styling', outputSection:'Output',
   videoOnly:'Video only', paired:'Paired with subtitle', jobs:'jobs', fileCount:'files',
   auto:'Auto', libx264:'libx264', libx265:'libx265', nvencH264:'NVENC H.264', nvencHevc:'NVENC HEVC', qsvH264:'Intel QSV H.264', vaapiH264:'VA-API H.264', amfH264:'AMD AMF H.264',
-  pop:'Pop', highlight:'Highlight', karaoke:'Karaoke', fade:'Fade', slideUp:'Slide up', bounce:'Bounce', animationNone:'None',
+  pop:'Pop', highlight:'Highlight', karaoke:'Karaoke', wordByWord:'Word by word', fade:'Fade', slideUp:'Slide up', bounce:'Bounce', animationNone:'None',
   overview:'Overview', provider:'Provider', performance:'Performance', advanced:'Advanced',
   localProvider:'Local provider', primaryProvider:'Primary provider', testModels:'List models',
   remove:'Remove', chooseAsset:'Choose asset', assetName:'Asset name', noAssets:'No assets yet', noPresets:'No presets yet', noBrands:'No brands yet', noWorkflows:'No workflows yet',
@@ -50,7 +50,7 @@ const fr: typeof en = {
   uploadQueue:"File d’import", uploadProgress:"Progression de l’import", noJobs:'Aucun job', noJobsHint:'Déposez une vidéo ou choisissez des fichiers pour commencer.', edit:'Éditer', render:'Rendre', renderVideo:'Rendre la vidéo', downloadVideo:'Télécharger la vidéo', cancel:'Annuler', retry:'Réessayer', prepare:'Préparer',
   source:'Source', status:'Statut', progress:'Progression', output:'Sortie', error:'Erreur', updated:'Mis à jour', sidecar:'Sous-titre associé', none:'Aucun', created:'Créé',
   save:'Enregistrer', saved:'Enregistré', delete:'Supprimer', split:'Scinder', mergePrevious:'Fusionner précédent', mergeNext:'Fusionner suivant', retranscribe:'Retranscrire', reRender:'Rerendre', create:'Créer', close:'Fermer', select:'Sélectionner', browse:'Parcourir', back:'Retour', refresh:'Actualiser', new:'Nouveau', duplicate:'Dupliquer',
-  videoPreview:'Aperçu vidéo', subtitles:'Sous-titres', search:'Rechercher', replace:'Remplacer', replaceAll:'Tout remplacer', shift:'Décaler', milliseconds:'ms', seconds:'secondes',
+  videoPreview:'Aperçu vidéo', subtitles:'Sous-titres', search:'Rechercher', replace:'Remplacer', replaceAll:'Tout remplacer', removeFinalPeriods:'Supprimer les points finaux', undoPunctuation:'Annuler le nettoyage', finalPeriodsRemoved:'Points finaux supprimés', shift:'Décaler', milliseconds:'ms', seconds:'secondes',
   regroup:'Regrouper', maxChars:'Caractères max / ligne', maxLines:'Lignes max', export:'Exporter', exportSrt:'SRT', exportAss:'ASS', exportJson:'JSON', timingRepair:'Réparation des timings', timingRepairHint:'Le backend normalise les chevauchements et les timings des mots à l’enregistrement.',
   repairedOverlaps:'Chevauchements réparés', retimedLines:'Lignes de mots recalées', droppedEmpty:'Lignes vides retirées', currentTime:'Temps courant', jumpToLine:'Aller à la ligne',
   attachedSidecar:'Sous-titre associé', attachFile:'Importer un sous-titre', chooseServerFile:'Choisir sur le serveur', removeSidecar:'Retirer le sous-titre', replaceSidecar:'Remplacer le sous-titre',
@@ -77,7 +77,7 @@ const fr: typeof en = {
   typography:'Typographie', placement:'Placement', segmentation:'Segmentation', styling:'Style', outputSection:'Sortie',
   videoOnly:'Vidéo seule', paired:'Avec sous-titre', jobs:'jobs', fileCount:'fichiers',
   auto:'Auto', libx264:'libx264', libx265:'libx265', nvencH264:'NVENC H.264', nvencHevc:'NVENC HEVC', qsvH264:'Intel QSV H.264', vaapiH264:'VA-API H.264', amfH264:'AMD AMF H.264',
-  pop:'Pop', highlight:'Surbrillance', karaoke:'Karaoké', fade:'Fondu', slideUp:'Glissé haut', bounce:'Rebond', animationNone:'Aucune',
+  pop:'Pop', highlight:'Surbrillance', karaoke:'Karaoké', wordByWord:'Mot par mot', fade:'Fondu', slideUp:'Glissé haut', bounce:'Rebond', animationNone:'Aucune',
   overview:'Vue d’ensemble', provider:'Fournisseur', performance:'Performances', advanced:'Avancé',
   localProvider:'Fournisseur local', primaryProvider:'Fournisseur principal', testModels:'Lister les modèles',
   remove:'Retirer', chooseAsset:'Choisir un asset', assetName:"Nom de l’asset", noAssets:'Aucun asset', noPresets:'Aucun preset', noBrands:'Aucune marque', noWorkflows:'Aucun workflow',
diff --git a/frontend/src/lib/preview.js b/frontend/src/lib/preview.js
index eb5f52b..b39514e 100644
--- a/frontend/src/lib/preview.js
+++ b/frontend/src/lib/preview.js
@@ -121,6 +121,30 @@ export function previewSubtitleTokens(text, words = []) {
   });
 }
 
+/** Group fragments that should read as one spoken word for word-by-word captions.
+ *  Handles French elisions (l' + amour), split hyphen compounds (rendez- + vous / peut + -être),
+ *  and standalone closing punctuation without creating punctuation-only frames.
+ *  @param {Array<{word:string,start:number,end:number,separator?:string}>} tokens
+ */
+export function wordByWordPreviewTokens(tokens) {
+  /** @type {Array<{word:string,start:number,end:number,separator?:string}>} */
+  const units = [];
+  const closingPunctuation = /^[,.;:!?…)}\]»”]+$/u;
+  const joinsNext = /['’\-‐‑]$/u;
+  const joinsPrevious = /^[\-‐‑]/u;
+  for (const token of tokens) {
+    const current = { ...token };
+    const previous = units.at(-1);
+    if (previous && (joinsNext.test(previous.word) || joinsPrevious.test(current.word) || closingPunctuation.test(current.word))) {
+      previous.word += current.word;
+      previous.end = Math.max(previous.end, current.end);
+      continue;
+    }
+    units.push(current);
+  }
+  return units;
+}
+
 /** @param {number} time @param {number} start @param {number} end */
 export function karaokeProgress(time, start, end) {
   const duration = Math.max(0.001, end - start);
diff --git a/frontend/src/lib/subtitle-edit.js b/frontend/src/lib/subtitle-edit.js
index 8ad8093..1f34fea 100644
--- a/frontend/src/lib/subtitle-edit.js
+++ b/frontend/src/lib/subtitle-edit.js
@@ -57,3 +57,20 @@ export function mergeSubtitleLines(lines, leftIndex) {
 export function deleteSubtitleLine(lines, index) {
   return index < 0 || index >= lines.length ? lines : lines.filter((_, position) => position !== index);
 }
+
+/** @param {string} value */
+function stripVisualLineTerminalPeriod(value) {
+  return value.replace(/(?<!\.)\.(\s*)([”’"'»)\]}]*)(\s*)$/u, '$1$2$3');
+}
+
+/** Remove sentence-ending full stops at visual-line boundaries while preserving commas, !, ?, and ellipses.
+ *  This edits caption text rather than hiding punctuation at render time, so selected punctuation can be re-added manually.
+ *  @param {SubtitleLine[]} lines @returns {SubtitleLine[]}
+ */
+export function removeTerminalPeriods(lines) {
+  return lines.map(line => {
+    const next = copy(line);
+    next.text = line.text.split('\n').map(stripVisualLineTerminalPeriod).join('\n');
+    return next;
+  });
+}
diff --git a/frontend/src/lib/types.ts b/frontend/src/lib/types.ts
index 017f3b2..c17bff3 100644
--- a/frontend/src/lib/types.ts
+++ b/frontend/src/lib/types.ts
@@ -6,7 +6,7 @@ export interface FormatProfile { key: FormatKey; fit: FitMode; width?: number; h
 export interface SubtitleWord { word:string; start:number; end:number }
 export interface FontFace { id:string; family:string; fullName:string; style:string; weight:number; italic:boolean; fileName:string }
 export interface SubtitleLine { id:number; start:number; end:number; text:string; words?:SubtitleWord[] }
-export type AnimationStyle = 'pop'|'highlight'|'karaoke'|'fade'|'slide-up'|'bounce'|'none';
+export type AnimationStyle = 'pop'|'highlight'|'karaoke'|'word-by-word'|'fade'|'slide-up'|'bounce'|'none';
 export interface Preset {
   id:string; name:string; brandId?:string; format:FormatProfile; animationStyle:AnimationStyle; size:number; positionX:number; positionY:number;
   baseColor:string; outlineColor:string; highlightColor:string; fontFamily:string; uppercase:boolean; outlineThickness:number; shadowThickness?:number;
diff --git a/frontend/src/lib/views/EditorView.svelte b/frontend/src/lib/views/EditorView.svelte
index d64ba3c..748a88f 100644
--- a/frontend/src/lib/views/EditorView.svelte
+++ b/frontend/src/lib/views/EditorView.svelte
@@ -2,7 +2,7 @@
   import { api, sourceVideoUrl, subtitleExportUrl } from '$lib/api';
   import { dictionary } from '$lib/i18n';
   import { subtitlesToVtt } from '$lib/captions.js';
-  import { splitSubtitleLine, mergeSubtitleLines, deleteSubtitleLine } from '$lib/subtitle-edit.js';
+  import { splitSubtitleLine, mergeSubtitleLines, deleteSubtitleLine, removeTerminalPeriods } from '$lib/subtitle-edit.js';
   import { fetchDownload, saveDownload } from '$lib/download.js';
   import type { Asset, Brand, FontFace, FormatKey, FitMode, FormatProfile, Job, JobOutro, Preset, SubtitleLine } from '$lib/types';
   import StatusPill from '$lib/components/StatusPill.svelte';
@@ -42,6 +42,7 @@
   let fileInput:HTMLInputElement;
   let textareas:HTMLTextAreaElement[]=[];
   let report:{repairedLineOverlaps:number;retimedWordLines:number;droppedEmptyLines:number}|undefined;
+  let punctuationBackup:SubtitleLine[]|undefined;
   let previewFormat:FormatProfile={key:'source',fit:'preserve'};
 
   $: if(job && job.id!==loadedId){ loadedId=job.id; hydrate(job); }
@@ -59,7 +60,7 @@
   $: previewFormat={key:formatKey,fit:formatKey==='source'?'preserve':fit,width:formatKey==='custom'?Number(customWidth):undefined,height:formatKey==='custom'?Number(customHeight):undefined};
 
   function hydrate(j:Job){
-    lines=(j.lines??[]).map(l=>({...l,words:l.words?.map(w=>({...w}))})); dirty=false; report=undefined;
+    lines=(j.lines??[]).map(l=>({...l,words:l.words?.map(w=>({...w}))})); dirty=false; report=undefined; punctuationBackup=undefined;
     selectedPreset=j.presetId??''; formatKey=j.format?.key??'source'; fit=j.format?.fit??'preserve'; previousFormatKey=formatKey; customWidth=j.format?.width??1080; customHeight=j.format?.height??1920;
     const p=presets.find(p=>p.id===selectedPreset); if(p){maxChars=p.maxChars;maxLines=p.maxLines;}
     outroChoice=j.outro?.mode==='asset'?`asset:${j.outro.assetId}`:j.outro?.mode??'inherit';
@@ -70,6 +71,22 @@
   async function regroup(){if(!job)return;try{if(dirty && !(await save()))return;lines=await api.regroup(job.id,maxChars,maxLines);dirty=false;await refresh()}catch(e){notify('error',e instanceof Error?e.message:String(e))}}
   function shiftAll(){const d=Number(shiftMs||0)/1000;lines=lines.map(l=>({...l,start:Math.max(0,l.start+d),end:Math.max(.02,l.end+d),words:l.words?.map(w=>({...w,start:Math.max(0,w.start+d),end:Math.max(.02,w.end+d)}))}));dirty=true}
   function replaceText(){if(!search)return; lines=lines.map(l=>({...l,text:l.text.split(search).join(replace)}));dirty=true}
+  function removeFinalPeriods(){
+    const before=lines.map(l=>({...l,words:l.words?.map(w=>({...w}))}));
+    const next=removeTerminalPeriods(lines);
+    const changed=next.reduce((count,line,index)=>count+(line.text!==lines[index]?.text?1:0),0);
+    if(!changed)return;
+    punctuationBackup=before;
+    lines=next;
+    dirty=true;
+    notify('info', `${changed} · ${$dictionary.finalPeriodsRemoved}`);
+  }
+  function undoPunctuationCleanup(){
+    if(!punctuationBackup)return;
+    lines=punctuationBackup;
+    punctuationBackup=undefined;
+    dirty=true;
+  }
   function split(i:number){const textarea=textareas[i];lines=splitSubtitleLine(lines,i,textarea?.selectionStart??Math.floor(lines[i].text.length/2));dirty=true}
   function merge(i:number){lines=mergeSubtitleLines(lines,i);dirty=true}
   function remove(i:number){lines=deleteSubtitleLine(lines,i);dirty=true}
@@ -113,6 +130,8 @@
               <div class="field" style="flex:1"><label for="editor-field-1">{$dictionary.search}</label><input id="editor-field-1" class="input" bind:value={search}/></div>
               <div class="field" style="flex:1"><label for="editor-field-2">{$dictionary.replace}</label><input id="editor-field-2" class="input" bind:value={replace}/></div>
               <button class="btn" disabled={locked||!search} on:click={replaceText}>{$dictionary.replaceAll}</button>
+              <button class="btn" disabled={locked||!lines.length} on:click={removeFinalPeriods}>−. {$dictionary.removeFinalPeriods}</button>
+              {#if punctuationBackup}<button class="btn ghost" disabled={locked} on:click={undoPunctuationCleanup}>↶ {$dictionary.undoPunctuation}</button>{/if}
               <div class="field" style="width:105px"><label for="editor-field-3">{$dictionary.shift}</label><input id="editor-field-3" class="input" type="number" bind:value={shiftMs}/></div>
               <button class="btn" disabled={locked} on:click={shiftAll}>± {$dictionary.milliseconds}</button>
             </div>
diff --git a/frontend/src/lib/views/PresetsView.svelte b/frontend/src/lib/views/PresetsView.svelte
index b9eaacb..c3fb2bb 100644
--- a/frontend/src/lib/views/PresetsView.svelte
+++ b/frontend/src/lib/views/PresetsView.svelte
@@ -77,7 +77,7 @@
 
       <div class="grid two">
         <section class="card"><div class="card-header"><strong>{$dictionary.styling}</strong></div><div class="card-body stack">
-          <div class="grid two"><div class="field"><label for="presets-field-7">{$dictionary.animation}</label><select id="presets-field-7" class="select" bind:value={draft.animationStyle}><option value="pop">{$dictionary.pop}</option><option value="highlight">{$dictionary.highlight}</option><option value="karaoke">{$dictionary.karaoke}</option><option value="fade">{$dictionary.fade}</option><option value="slide-up">{$dictionary.slideUp}</option><option value="bounce">{$dictionary.bounce}</option><option value="none">{$dictionary.animationNone}</option></select></div><div class="field"><label for="presets-field-8">{$dictionary.font}</label><select id="presets-field-8" class="select" value={selectedCustomFont?.id ?? ""} on:change={selectFont}>{#if !selectedCustomFont}<option value="">{draft.fontFamily}</option>{/if}{#each fonts as font}<option value={font.id}>{font.fileName} · {font.fullName || font.family} · {font.style}</option>{/each}</select>{#if selectedCustomFont && fontStatus}<span class="help" class:font-loaded={fontStatus.status === "loaded"}>{fontStatus.status === "loaded" ? "✓ Custom font loaded" : "⚠ Custom font fallback"} · {fontStatus.fileName}</span>{/if}</div></div>
+          <div class="grid two"><div class="field"><label for="presets-field-7">{$dictionary.animation}</label><select id="presets-field-7" class="select" bind:value={draft.animationStyle}><option value="pop">{$dictionary.pop}</option><option value="highlight">{$dictionary.highlight}</option><option value="karaoke">{$dictionary.karaoke}</option><option value="word-by-word">{$dictionary.wordByWord}</option><option value="fade">{$dictionary.fade}</option><option value="slide-up">{$dictionary.slideUp}</option><option value="bounce">{$dictionary.bounce}</option><option value="none">{$dictionary.animationNone}</option></select></div><div class="field"><label for="presets-field-8">{$dictionary.font}</label><select id="presets-field-8" class="select" value={selectedCustomFont?.id ?? ""} on:change={selectFont}>{#if !selectedCustomFont}<option value="">{draft.fontFamily}</option>{/if}{#each fonts as font}<option value={font.id}>{font.fileName} · {font.fullName || font.family} · {font.style}</option>{/each}</select>{#if selectedCustomFont && fontStatus}<span class="help" class:font-loaded={fontStatus.status === "loaded"}>{fontStatus.status === "loaded" ? "✓ Custom font loaded" : "⚠ Custom font fallback"} · {fontStatus.fileName}</span>{/if}</div></div>
           <div class="grid three"><div class="field"><label for="presets-field-9">{$dictionary.baseColor}</label><input id="presets-field-9" class="input" type="color" bind:value={draft.baseColor}/></div><div class="field"><label for="presets-field-10">{$dictionary.highlightColor}</label><input id="presets-field-10" class="input" type="color" bind:value={draft.highlightColor}/></div><div class="field"><label for="presets-field-11">{$dictionary.outlineColor}</label><input id="presets-field-11" class="input" type="color" bind:value={draft.outlineColor}/></div></div>
           <div class="grid two"><div class="field"><label for="presets-field-12">{$dictionary.size}</label><input id="presets-field-12" class="input" type="number" min="8" max="160" bind:value={draft.size}/></div><div class="field"><label for="presets-field-13">{$dictionary.outline}</label><input id="presets-field-13" class="input" type="number" step=".1" min="0" bind:value={draft.outlineThickness}/></div></div>
           <div class="row wrap"><label class="check"><input type="checkbox" bind:checked={draft.bold}/>{$dictionary.bold}</label><label class="check"><input type="checkbox" bind:checked={draft.italic}/>{$dictionary.italic}</label><label class="check"><input type="checkbox" bind:checked={draft.uppercase}/>{$dictionary.uppercase}</label><label class="check"><input type="checkbox" bind:checked={draft.floating}/>{$dictionary.floating}</label></div>
diff --git a/frontend/tests/integration-docs.test.mjs b/frontend/tests/integration-docs.test.mjs
index 7f61184..2e012ab 100644
--- a/frontend/tests/integration-docs.test.mjs
+++ b/frontend/tests/integration-docs.test.mjs
@@ -4,7 +4,7 @@ import { readFile } from 'node:fs/promises';
 
 const root = new URL('../../', import.meta.url);
 
-test('v3.1.2 integration docs expose the shipped version and lifecycle API', async () => {
+test('v3.2.0 integration docs expose the shipped version and lifecycle API', async () => {
   const [cargo, frontend, lock, changelog, readme] = await Promise.all([
     readFile(new URL('Cargo.toml', root), 'utf8'),
     readFile(new URL('frontend/package.json', root), 'utf8'),
@@ -13,9 +13,9 @@ test('v3.1.2 integration docs expose the shipped version and lifecycle API', asy
     readFile(new URL('README.md', root), 'utf8')
   ]);
 
-  assert.match(cargo, /version = "3\.1\.2"/);
-  assert.match(frontend, /"version": "3\.1\.2"/);
-  assert.match(lock, /"version": "3\.1\.2"/g);
+  assert.match(cargo, /version = "3\.2\.0"/);
+  assert.match(frontend, /"version": "3\.2\.0"/);
+  assert.match(lock, /"version": "3\.2\.0"/g);
   for (const endpoint of ['/api/v1/fonts', '/api/v1/fonts/css', '/api/v1/jobs/{id}/retranscribe']) {
     assert.ok(readme.includes(endpoint), `missing README endpoint: ${endpoint}`);
   }
diff --git a/frontend/tests/preview.test.mjs b/frontend/tests/preview.test.mjs
index 8c3bc0d..b0ca7db 100644
--- a/frontend/tests/preview.test.mjs
+++ b/frontend/tests/preview.test.mjs
@@ -99,7 +99,7 @@ test('preview exposes every animation family and timed-word inputs', async () =>
   const source = await (await import('node:fs/promises')).readFile(
     new URL('../src/lib/components/FormatPreview.svelte', import.meta.url), 'utf8'
   );
-  for (const style of ['pop', 'highlight', 'bounce', 'karaoke', 'fade', 'slide-up', 'none']) {
+  for (const style of ['pop', 'highlight', 'bounce', 'karaoke', 'word-by-word', 'fade', 'slide-up', 'none']) {
     assert.match(source, new RegExp(`animation-${style.replace('-', '\\-')}`));
   }
   assert.match(source, /export let words/);
@@ -166,3 +166,19 @@ test('subtitle download keeps the server filename and surfaces API errors', asyn
     /export unavailable/
   );
 });
+
+test('word-by-word preview groups apostrophe and hyphen continuations', async () => {
+  const { wordByWordPreviewTokens } = await import('../src/lib/preview.js');
+  const tokens = [
+    { word: "l'", start: 0, end: 0.1, separator: '' },
+    { word: 'amour', start: 0.1, end: 0.4, separator: ' ' },
+    { word: 'rendez-', start: 0.5, end: 0.7, separator: ' ' },
+    { word: 'vous', start: 0.7, end: 1.0, separator: ' ' },
+    { word: 'demain', start: 1.1, end: 1.4, separator: ' ' }
+  ];
+  assert.deepEqual(wordByWordPreviewTokens(tokens), [
+    { word: "l'amour", start: 0, end: 0.4, separator: '' },
+    { word: 'rendez-vous', start: 0.5, end: 1.0, separator: ' ' },
+    { word: 'demain', start: 1.1, end: 1.4, separator: ' ' }
+  ]);
+});
diff --git a/frontend/tests/subtitle-edit.test.mjs b/frontend/tests/subtitle-edit.test.mjs
index 444a66a..0b8e592 100644
--- a/frontend/tests/subtitle-edit.test.mjs
+++ b/frontend/tests/subtitle-edit.test.mjs
@@ -28,3 +28,27 @@ test('mergeSubtitleLines combines adjacent timed words', () => {
 test('deleteSubtitleLine removes only the selected block', () => {
   assert.deepEqual(deleteSubtitleLine([line, { ...line, id: 5 }], 0).map(({ id }) => id), [5]);
 });
+
+test('removeTerminalPeriods strips only caption-ending full stops', async () => {
+  const { removeTerminalPeriods } = await import('../src/lib/subtitle-edit.js');
+  const input = [
+    { ...line, id: 10, text: 'Bonjour.' },
+    { ...line, id: 11, text: 'Ça va !' },
+    { ...line, id: 12, text: 'Vraiment ?' },
+    { ...line, id: 13, text: 'Oui,' },
+    { ...line, id: 14, text: 'Attends...' },
+    { ...line, id: 15, text: 'M. Dupont.' },
+    { ...line, id: 16, text: '« Bonjour. »' },
+    { ...line, id: 17, text: 'Première ligne.\nDeuxième ligne.' }
+  ];
+  assert.deepEqual(removeTerminalPeriods(input).map(({ text }) => text), [
+    'Bonjour',
+    'Ça va !',
+    'Vraiment ?',
+    'Oui,',
+    'Attends...',
+    'M. Dupont',
+    '« Bonjour »',
+    'Première ligne\nDeuxième ligne'
+  ]);
+});
diff --git a/src/domain.rs b/src/domain.rs
index 069fea1..1953c85 100644
--- a/src/domain.rs
+++ b/src/domain.rs
@@ -148,6 +148,7 @@ pub enum AnimationStyle {
     Pop,
     Highlight,
     Karaoke,
+    WordByWord,
     Fade,
     SlideUp,
     Bounce,
diff --git a/src/subtitle/ass.rs b/src/subtitle/ass.rs
index 696706f..eab2ef4 100644
--- a/src/subtitle/ass.rs
+++ b/src/subtitle/ass.rs
@@ -1,4 +1,4 @@
-use crate::domain::{AnimationStyle, Preset, SubtitleLine};
+use crate::domain::{AnimationStyle, Preset, SubtitleLine, SubtitleWord};
 use crate::subtitle::normalize::{NormalizeOptions, normalize_subtitles};
 use crate::subtitle::segment::grapheme_len;
 
@@ -75,6 +75,59 @@ fn float_tags(duration_ms: i64, speed: f64) -> String {
     tags
 }
 
+fn is_closing_punctuation_token(value: &str) -> bool {
+    let value = value.trim();
+    !value.is_empty()
+        && value.chars().all(|c| {
+            matches!(
+                c,
+                ',' | '.' | ';' | ':' | '!' | '?' | '…' | ')' | ']' | '}' | '»' | '”'
+            )
+        })
+}
+
+fn word_by_word_units(line: &SubtitleLine) -> Vec<SubtitleWord> {
+    let tokens: Vec<&str> = line.text.split_whitespace().collect();
+    if tokens.is_empty() {
+        return Vec::new();
+    }
+
+    let source_words = line.words.as_deref().unwrap_or(&[]);
+    let fallback_duration = ((line.end - line.start).max(0.001)) / tokens.len() as f64;
+    let mut units: Vec<SubtitleWord> = Vec::with_capacity(tokens.len());
+
+    for (index, token) in tokens.into_iter().enumerate() {
+        let (start, end) = source_words
+            .get(index)
+            .map(|word| (word.start, word.end))
+            .unwrap_or_else(|| {
+                let start = line.start + fallback_duration * index as f64;
+                (start, (start + fallback_duration).min(line.end))
+            });
+        let current = SubtitleWord {
+            word: token.to_string(),
+            start,
+            end,
+        };
+
+        if let Some(previous) = units.last_mut() {
+            let left = previous.word.trim_end();
+            let right = current.word.trim_start();
+            let joins = left.ends_with(['\'', '’', '-', '‐', '‑'])
+                || right.starts_with(['-', '‐', '‑'])
+                || is_closing_punctuation_token(right);
+            if joins {
+                previous.word = format!("{left}{right}");
+                previous.end = previous.end.max(current.end);
+                continue;
+            }
+        }
+        units.push(current);
+    }
+
+    units
+}
+
 pub fn generate_ass_content(
     lines: &[SubtitleLine],
     preset: &Preset,
@@ -138,14 +191,32 @@ Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text
             continue;
         }
         let words = line.words.clone().unwrap_or_default();
-        let longest_line = visual_lines
-            .iter()
-            .map(|visual| grapheme_len(visual))
-            .max()
-            .unwrap_or(1) as f64;
+        let word_units = if preset.animation_style == AnimationStyle::WordByWord {
+            word_by_word_units(&line)
+        } else {
+            Vec::new()
+        };
+        let longest_line = if preset.animation_style == AnimationStyle::WordByWord {
+            word_units
+                .iter()
+                .map(|word| grapheme_len(&word.word))
+                .max()
+                .unwrap_or(1) as f64
+        } else {
+            visual_lines
+                .iter()
+                .map(|visual| grapheme_len(visual))
+                .max()
+                .unwrap_or(1) as f64
+        };
+        let visual_line_count = if preset.animation_style == AnimationStyle::WordByWord {
+            1
+        } else {
+            visual_lines.len()
+        };
         let block_width = (longest_line * size * 0.56).min(play_x as f64 * 0.9);
-        let block_height = (visual_lines.len() as f64 * size
-            + visual_lines.len().saturating_sub(1) as f64 * line_spacing)
+        let block_height = (visual_line_count as f64 * size
+            + visual_line_count.saturating_sub(1) as f64 * line_spacing)
             .max(size)
             .min(play_y as f64 * 0.9);
         let min_x = (play_x as f64 * 0.05 + block_width / 2.0).round() as i32;
@@ -157,6 +228,37 @@ Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text
         let name = format!("autosubs:{}", line.id);
 
         match preset.animation_style {
+            AnimationStyle::WordByWord => {
+                for (index, unit) in word_units.iter().enumerate() {
+                    let start = unit.start.max(line.start).min(line.end);
+                    if start >= line.end {
+                        continue;
+                    }
+                    let next_start = word_units
+                        .get(index + 1)
+                        .map(|word| word.start)
+                        .unwrap_or(line.end);
+                    let end = next_start.min(line.end).max((start + 0.001).min(line.end));
+                    if end <= start {
+                        continue;
+                    }
+                    let float = if preset.floating {
+                        float_tags(((end - start) * 1000.0) as i64, preset.wobble_speed)
+                    } else {
+                        String::new()
+                    };
+                    let rendered = format!(
+                        "{{\\q2\\pos({x},{y})}}{float}{}",
+                        safe_text(&unit.word, preset.uppercase)
+                    );
+                    out.push_str(&format!(
+                        "Dialogue: 0,{},{},Default,{name},0,0,0,,{}\n",
+                        format_ass_time(start),
+                        format_ass_time(end),
+                        rendered
+                    ));
+                }
+            }
             AnimationStyle::Pop | AnimationStyle::Highlight | AnimationStyle::Bounce => {
                 for active in 0..total_words {
                     let duration = (line.end - line.start) / total_words as f64;
@@ -442,4 +544,56 @@ mod tests {
         assert!(ass.contains("\\t(0,70,\\fscy125\\fscx105)\\t(70,150,\\fscy100\\fscx100)"));
         assert!(ass.matches("Dialogue:").count() >= 2);
     }
+
+    #[test]
+    fn word_by_word_displays_one_spoken_unit_and_joins_french_prefixes() {
+        let line = SubtitleLine {
+            id: 9,
+            start: 0.0,
+            end: 2.0,
+            text: "l' amour rendez- vous demain".into(),
+            words: Some(vec![
+                crate::domain::SubtitleWord {
+                    word: "l'".into(),
+                    start: 0.0,
+                    end: 0.1,
+                },
+                crate::domain::SubtitleWord {
+                    word: "amour".into(),
+                    start: 0.1,
+                    end: 0.4,
+                },
+                crate::domain::SubtitleWord {
+                    word: "rendez-".into(),
+                    start: 0.5,
+                    end: 0.7,
+                },
+                crate::domain::SubtitleWord {
+                    word: "vous".into(),
+                    start: 0.7,
+                    end: 1.0,
+                },
+                crate::domain::SubtitleWord {
+                    word: "demain".into(),
+                    start: 1.1,
+                    end: 1.5,
+                },
+            ]),
+        };
+        let preset = Preset {
+            animation_style: AnimationStyle::WordByWord,
+            uppercase: false,
+            ..Preset::default()
+        };
+        let ass = generate_ass_content(&[line], &preset, Some((1920, 1080)));
+        let dialogues: Vec<_> = ass
+            .lines()
+            .filter(|line| line.starts_with("Dialogue:"))
+            .collect();
+        assert_eq!(dialogues.len(), 3, "{ass}");
+        assert!(dialogues[0].contains("l'amour"), "{ass}");
+        assert!(dialogues[1].contains("rendez-vous"), "{ass}");
+        assert!(dialogues[2].contains("demain"), "{ass}");
+        assert!(!dialogues.iter().any(|line| line.ends_with("l'")), "{ass}");
+    }
 }