Merge branch 'kwaroran:main' into main

android/app/build.gradle

@@ -8,7 +8,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 2
-        versionName "114.3.0"
+        versionName "114.4.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.

android/app/release/output-metadata.json

@@ -12,7 +12,7 @@
       "filters": [],
       "attributes": [],
       "versionCode": 2,
-      "versionName": "114.3.0",
+      "versionName": "114.4.0",
       "outputFile": "app-release.apk"
     }
   ],

src-tauri/tauri.conf.json

@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "RisuAI",
-    "version": "114.3.0"
+    "version": "114.4.0"
   },
   "tauri": {
     "allowlist": {

src/ts/plugins/automark.ts

@@ -1,5 +1,7 @@
 
 const excludesDat = ['<','>','{','}','[',']','(',')','-',':',';','…','—','–','_','*','+','/','\\','|','!','?','.',',',' ']
+const symbols = ['<','>','{','}','[',']','(',')','-',':',';','…','—','–','_','*','+','/','\\','|','!','?','.',',',' ', '\n', '。', '、', '！', '？', '，', '；', '：', '（', '）', '【', '】', '「', '」', '『', '』', '“', '”', '‘', '’', '《', '》', '〈', '〉', '‹', '›', '«', '»', '‟', '„']
+
 const selfClosingTags = [
     'br','hr','img','input','meta','link','base','area','col','command','embed','keygen','param','source','track','wbr',
     //self closing tags defined by HTML5
@@ -123,6 +125,10 @@ export function risuFormater(dat:string){
         //spaces for detection
         line = ' ' + line + ' '
 
+        const isNotCharacter = (t:string) => {
+            return symbols.includes(t)
+        }
+
         for(let j=0;j<line.length;j++){
             switch(line[j]){
                 case '"':
@@ -145,7 +151,7 @@ export function risuFormater(dat:string){
                 case '‘':
                 case '’':{
                     if(depthChunkType[depth] === "'"){
-                        if(line[j-1] === ' ' || line[j+1] !== ' ' || (line[j-2] === 'i' && line[j-1] === 'n')){
+                        if(isNotCharacter(line[j-1]) || !isNotCharacter(line[j+1]) || (line[j-2] === 'i' && line[j-1] === 'n')){
                             //this is not a quote
                             depthChunk[depth] += line[j]
                         }
@@ -157,7 +163,7 @@ export function risuFormater(dat:string){
                         }
                     }
                     else{
-                        if(line[j-1] !== ' ' || line[j+1] === ' '){
+                        if(!isNotCharacter(line[j-1]) || isNotCharacter(line[j+1])){
                             //this is not a quote
                             depthChunk[depth] += line[j]
                         }

src/ts/storage/database.ts

@@ -14,7 +14,7 @@ import type { OobaChatCompletionRequestParams } from '../model/ooba';
 
 export const DataBase = writable({} as any as Database)
 export const loadedStore = writable(false)
-export let appVer = "114.3.0"
+export let appVer = "114.4.0"
 export let webAppSubVer = ''
 
 export function setDatabase(data:Database){

version.json

@@ -1 +1 @@
-{"version":"114.3.0"}
+{"version":"114.4.0"}