From a35db56b2bd0959c5ceba10d697e788360136f51 Mon Sep 17 00:00:00 2001 From: Hasinjato Date: Mon, 14 Sep 2026 14:16:51 +0300 Subject: [PATCH] Fix! time signature on print pdf --- .../src/androidMain/kotlin/mg/dot/feufaro/pdf/PdfExport.kt | 2 +- .../src/desktopMain/kotlin/mg/dot/feufaro/pdf/PdfExport.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/composeApp/src/androidMain/kotlin/mg/dot/feufaro/pdf/PdfExport.kt b/composeApp/src/androidMain/kotlin/mg/dot/feufaro/pdf/PdfExport.kt index 6967cee..2a386c2 100644 --- a/composeApp/src/androidMain/kotlin/mg/dot/feufaro/pdf/PdfExport.kt +++ b/composeApp/src/androidMain/kotlin/mg/dot/feufaro/pdf/PdfExport.kt @@ -363,7 +363,7 @@ private fun drawHeader( val keyW = tw(boldFont, sz3, keyTxt+keyTxt2) + 10f val sz32 = 14f val splitMeaRgx = """(\d+/\d+)\s+(.*)""".toRegex() - val matchRes = splitMeaRgx.matchEntire(measure) + val matchRes = splitMeaRgx.find(measure) var timeSignature = "" var titleSignature = "" if(matchRes != null) { diff --git a/composeApp/src/desktopMain/kotlin/mg/dot/feufaro/pdf/PdfExport.kt b/composeApp/src/desktopMain/kotlin/mg/dot/feufaro/pdf/PdfExport.kt index 666ba65..c0e4373 100644 --- a/composeApp/src/desktopMain/kotlin/mg/dot/feufaro/pdf/PdfExport.kt +++ b/composeApp/src/desktopMain/kotlin/mg/dot/feufaro/pdf/PdfExport.kt @@ -555,8 +555,8 @@ private fun drawHeader( val keyW = tw(boldFont, sz3, keyTxt+keyTxt2) + 10f val sz32 = 14f - val splitMeaRgx = """(\d+/\d+)\s+(.*)""".toRegex() - val matchRes = splitMeaRgx.matchEntire(measure) + val splitMeaRgx = """(\d+/\d+)(?:\s+(.*))?""".toRegex() + val matchRes = splitMeaRgx.find(measure) var timeSignature = "" var titleSignature = "" if(matchRes != null) {