rework some of changes for emphasis editing keys, force conversion of old-style emphasis (384fab96) · Commits · github_fork / Stable Diffusion Webui

javascript/edit-attention.js

+46 −55

Original line number	Diff line number	Diff line
		@@ -26,10 +26,15 @@ function keyupEditAttention(event) {

		// Set the selection to the text between the parenthesis
		const parenContent = text.substring(beforeParen + 1, selectionStart + afterParen);
		if (!/.*:-?[\d.]+/s.test(parenContent)) return false;
		if (/.*:-?[\d.]+/s.test(parenContent)) {
		const lastColon = parenContent.lastIndexOf(":");
		selectionStart = beforeParen + 1;
		selectionEnd = selectionStart + lastColon;
		} else {
		selectionStart = beforeParen + 1;
		selectionEnd = selectionStart + parenContent.length;
		}

		target.setSelectionRange(selectionStart, selectionEnd);
		return true;
		}
		@@ -58,7 +63,7 @@ function keyupEditAttention(event) {
		}

		// If the user hasn't selected anything, let's select their current parenthesis block or word
		if (!selectCurrentParenthesisBlock('<', '>') && !selectCurrentParenthesisBlock('(', ')')) {
		if (!selectCurrentParenthesisBlock('<', '>') && !selectCurrentParenthesisBlock('(', ')') && !selectCurrentParenthesisBlock('[', ']')) {
		selectCurrentWord();
		}

		@@ -66,24 +71,23 @@ function keyupEditAttention(event) {

		var closeCharacter = ')';
		var delta = opts.keyedit_precision_attention;
		var start = selectionStart > 0 ? text[selectionStart - 1] : "";
		var end = text[selectionEnd];

		if (selectionStart > 0 && /<.*:-?[\d.]+>/s.test(text.slice(selectionStart - 1, selectionEnd + text.slice(selectionEnd).indexOf(">") + 1))) {
		if (start == '<') {
		closeCharacter = '>';
		delta = opts.keyedit_precision_extra;
		} else if (selectionStart > 0 && /\(.\)\|\[.\]/s.test(text.slice(selectionStart - 1, selectionEnd + 1))) {
		let start = text[selectionStart - 1];
		let end = text[selectionEnd];
		if (opts.keyedit_convert) {
		} else if (start == '(' && end == ')' \|\| start == '[' && end == ']') { // convert old-style (((emphasis)))
		let numParen = 0;

		while (text[selectionStart - numParen - 1] == start && text[selectionEnd + numParen] == end) {
		numParen++;
		}

		if (start == "(") {
		weight = 1.1 ** numParen;
		} else {
		if (start == "[") {
		weight = (1 / 1.1) ** numParen;
		} else {
		weight = 1.1 ** numParen;
		}

		weight = Math.round(weight / opts.keyedit_precision_attention) * opts.keyedit_precision_attention;
		@@ -91,19 +95,7 @@ function keyupEditAttention(event) {
		text = text.slice(0, selectionStart - numParen) + "(" + text.slice(selectionStart, selectionEnd) + ":" + weight + ")" + text.slice(selectionEnd + numParen);
		selectionStart -= numParen - 1;
		selectionEnd -= numParen - 1;
		} else {
		closeCharacter = null;
		if (isPlus) {
		text = text.slice(0, selectionStart) + start + text.slice(selectionStart, selectionEnd) + end + text.slice(selectionEnd);
		selectionStart++;
		selectionEnd++;
		} else {
		text = text.slice(0, selectionStart - 1) + text.slice(selectionStart, selectionEnd) + text.slice(selectionEnd + 1);
		selectionStart--;
		selectionEnd--;
		}
		}
		} else if (selectionStart == 0 \|\| !/\(.*:-?[\d.]+\)/s.test(text.slice(selectionStart - 1, selectionEnd + text.slice(selectionEnd).indexOf(")") + 1))) {
		} else if (start != '(') {
		// do not include spaces at the end
		while (selectionEnd > selectionStart && text[selectionEnd - 1] == ' ') {
		selectionEnd--;
		@@ -119,9 +111,9 @@ function keyupEditAttention(event) {
		selectionEnd++;
		}

		if (closeCharacter) {
		var end = text.slice(selectionEnd + 1).indexOf(closeCharacter) + 1;
		var weight = parseFloat(text.slice(selectionEnd + 1, selectionEnd + end));
		if (text[selectionEnd] != ':') return;
		var weightLength = text.slice(selectionEnd + 1).indexOf(closeCharacter) + 1;
		var weight = parseFloat(text.slice(selectionEnd + 1, selectionEnd + weightLength));
		if (isNaN(weight)) return;

		weight += isPlus ? delta : -delta;
		@@ -134,8 +126,7 @@ function keyupEditAttention(event) {
		selectionStart--;
		selectionEnd--;
		} else {
		text = text.slice(0, selectionEnd + 1) + weight + text.slice(selectionEnd + end);
		}
		text = text.slice(0, selectionEnd + 1) + weight + text.slice(selectionEnd + weightLength);
		}

		target.focus();

modules/shared_options.py

+1 −2

Original line number	Diff line number	Diff line
		@@ -259,9 +259,8 @@ options_templates.update(options_section(('ui', "User interface"), {
		"dimensions_and_batch_together": OptionInfo(True, "Show Width/Height and Batch sliders in same row").needs_reload_ui(),
		"keyedit_precision_attention": OptionInfo(0.1, "Ctrl+up/down precision when editing (attention:1.1)", gr.Slider, {"minimum": 0.01, "maximum": 0.2, "step": 0.001}),
		"keyedit_precision_extra": OptionInfo(0.05, "Ctrl+up/down precision when editing <extra networks:0.9>", gr.Slider, {"minimum": 0.01, "maximum": 0.2, "step": 0.001}),
		"keyedit_delimiters": OptionInfo(r".,\/!?%^*;:{}=`~()[]<>\| ", "Ctrl+up/down word delimiters"),
		"keyedit_delimiters": OptionInfo(r".,\/!?%^*;:{}=`~() ", "Ctrl+up/down word delimiters"),
		"keyedit_delimiters_whitespace": OptionInfo(["Tab", "Carriage Return", "Line Feed"], "Ctrl+up/down whitespace delimiters", gr.CheckboxGroup, lambda: {"choices": ["Tab", "Carriage Return", "Line Feed"]}),
		"keyedit_convert": OptionInfo(True, "Convert (attention) to (attention:1.1)"),
		"keyedit_move": OptionInfo(True, "Alt+left/right moves prompt elements"),
		"quicksettings_list": OptionInfo(["sd_model_checkpoint"], "Quicksettings list", ui_components.DropdownMulti, lambda: {"choices": list(shared.opts.data_labels.keys())}).js("info", "settingsHintsShowQuicksettings").info("setting entries that appear at the top of page rather than in settings tab").needs_reload_ui(),
		"ui_tab_order": OptionInfo([], "UI tab order", ui_components.DropdownMulti, lambda: {"choices": list(shared.tab_names)}).needs_reload_ui(),

Admin message