From 954f03c5c063a11ec3547f4760ffb06a78fe12e0 Mon Sep 17 00:00:00 2001
From: Mischa POSLAWSKY <perl@shiar.org>
Date: Wed, 25 Aug 2021 06:54:54 +0200
Subject: [PATCH] latin: omit span container on sample svg

---
 latinsample.js      | 4 +++-
 writing-latn.inc.pl | 8 ++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/latinsample.js b/latinsample.js
index 406cac1..846e500 100644
--- a/latinsample.js
+++ b/latinsample.js
@@ -44,7 +44,9 @@ function appendsample() {
 				output += cols[col].split('&nbsp;')[final ? 1 : 0];
 			}
 			else if (col < cols.length) {
-				output += '<span>' + (cols[col] || ' ') + '</span>';
+				var final = cols[col] || ' ';
+				if (!/^<svg/.test(cols[col])) final = `<span>${final}</span>`;
+				output += final;
 			}
 			else {
 				output += '<b> </b>';
diff --git a/writing-latn.inc.pl b/writing-latn.inc.pl
index 42a680c..ad13ae5 100644
--- a/writing-latn.inc.pl
+++ b/writing-latn.inc.pl
@@ -15,10 +15,10 @@ my @wrapstyle = (
 	'td { white-space: normal; word-spacing: 10em }',
 		# force line break between words
 	'.sample { word-spacing: 0 }',
-	'.sample span { margin-right: 1ex; white-space: nowrap; display: inline-block }',
+	'.sample svg { margin-right: 1ex; white-space: nowrap; display: inline-block }',
 		# larger space between letters
 );
-my $spacestyle = '.sample span { margin-right: 0.5ex }';  # separate letters
+my $spacestyle = '.sample svg { margin-right: 0.5ex }';  # separate letters
 my @tapstyle = (
 	@wrapstyle,
 	'{ line-height: 1ex }',
@@ -153,7 +153,7 @@ roman => {
 	name => 'Old Roman Cursive',
 	style => [
 		'svg path { stroke-linecap: round; stroke-linejoin: round }',
-		'.sample span { margin-right: -10px }',
+		'.sample svg { margin-right: -10px }',
 	],
 	list => [
 		map {
@@ -643,7 +643,7 @@ dni => {
 	name => "D'ni",
 	style => [
 		'svg { border: 1px solid currentColor }',
-		'.sample span + span svg { border-left: 0 }',
+		'.sample svg + svg { border-left: 0 }',
 	],
 	list => [
 		map {
-- 
2.30.0