fix: unify inline and block code font families by Jocs · Pull Request #5783 · marktext/marktext · GitHub
Skip to content

fix: unify inline and block code font families #5783

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Jocs merged 9 commits into from
Oct 18, 2026
Merged

fix: unify inline and block code font families #5783

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9ebf559
fix: share inline and block code font families
Jocs Oct 18, 2026
fc47ac8
refactor: simplify exported code font handling
Jocs Oct 18, 2026
995d0a1
refactor: keep code font rules in existing stylesheets
Jocs Oct 18, 2026
6fa0857
refactor: keep inline code typography with inline styles
Jocs Oct 18, 2026
450c5ef
refactor: read exported code font directly from options
Jocs Oct 18, 2026
548ba72
refactor: remove redundant export font validation
Jocs Oct 18, 2026
4a1dc03
refactor: simplify code font CSS interpolation
Jocs Oct 18, 2026
746be3b
fix: clarify shared code font preference placement
Jocs Oct 18, 2026
180c92a
refactor: place code font before editor max width
Jocs Oct 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions packages/desktop/src/renderer/src/prefComponents/common/fontTextBox/index.vue
View file
Open in desktop
13 changes: 7 additions & 6 deletions packages/desktop/src/renderer/src/prefComponents/editor/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,13 @@
:value="editorFontFamily"
:on-change="(value) => onSelectChange('editorFontFamily', value)"
/>
<font-text-box
:description="t('preferences.editor.textEditor.codeFontFamily')"
:notes="t('preferences.editor.textEditor.codeFontFamilyNotes')"
:only-monospace="true"
:value="codeFontFamily"
:on-change="(value) => onSelectChange('codeFontFamily', value)"
/>
<text-box
:description="t('preferences.editor.textEditor.maxWidth')"
:notes="t('preferences.editor.textEditor.maxWidthNotes')"
Expand Down Expand Up @@ -58,12 +65,6 @@
:step="1"
:on-change="(value) => onSelectChange('codeFontSize', value)"
/>
<font-text-box
:description="t('preferences.editor.codeBlock.fontFamily')"
:only-monospace="true"
:value="codeFontFamily"
:on-change="(value) => onSelectChange('codeFontFamily', value)"
/>
<bool
:description="t('preferences.editor.codeBlock.showLineNumbers')"
:bool="codeBlockLineNumbers"
Expand Down
7 changes: 4 additions & 3 deletions packages/desktop/static/locales/de.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@
"wrapCodeBlocks": "Text in Codeblöcken umbrechen",
"editorLineWidth": "Definiert die maximale Editor-Bereichsbreite. Ein leerer String oder Suffixe von ch (Zeichen), px (Pixel) oder % (Prozent) sind erlaubt",
"codeFontSize": "Schriftgröße im Codeblock, der Bereich ist 12 ~ 18",
"codeFontFamily": "Schriftfamilie im Codeblock",
"codeFontFamily": "Code-Schriftart. Gilt für Inline-Code und Codeblöcke.",
"codeBlockLineNumbers": "Ob Zeilennummern angezeigt werden sollen",
"sourceCodeLineNumbers": "Zeilennummern im Quellcode-Modus anzeigen",
"trimUnnecessaryCodeBlockEmptyLines": "Leere Zeilen am Anfang und Ende des Codeblocks entfernen",
Expand Down Expand Up @@ -540,12 +540,13 @@
"fontFamily": "Schriftfamilie",
"maxWidth": "Maximale Breite",
"maxWidthNotes": "Maximale Breite des Editor-Inhalts. Geben Sie eine Zahl gefolgt von px, ch (Zeichen) oder % ein, z. B. 800px, 80ch oder 60%. Leer lassen, um die Standardbreite zu verwenden.",
"maxWidthInvalid": "Geben Sie eine Zahl gefolgt von px, ch oder % ein, z. B. 800px."
"maxWidthInvalid": "Geben Sie eine Zahl gefolgt von px, ch oder % ein, z. B. 800px.",
"codeFontFamily": "Code-Schriftart",
"codeFontFamilyNotes": "Gilt für Inline-Code und Codeblöcke."
},
"codeBlock": {
"title": "Code-Block",
"fontSize": "Schriftgröße",
"fontFamily": "Schriftfamilie",
"showLineNumbers": "Zeilennummern anzeigen",
"removeEmptyLines": "Leere Zeilen entfernen"
},
Expand Down
7 changes: 4 additions & 3 deletions packages/desktop/static/locales/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@
"wrapCodeBlocks": "Wrap text inside code blocks",
"editorLineWidth": "Defines the maximum editor area width. An empty string or suffixes of ch (characters), px (pixels) or % (percentage) are allowed",
"codeFontSize": "Font size in code Block, the range is 12 ~ 18",
"codeFontFamily": "Font family used in code block",
"codeFontFamily": "Code font family. Applies to inline code and code blocks.",
"codeBlockLineNumbers": "Whether to show the line numbers",
"sourceCodeLineNumbers": "Show line numbers in source code mode",
"trimUnnecessaryCodeBlockEmptyLines": "Trim the beginning and ending empty lines in code block",
Expand Down Expand Up @@ -540,12 +540,13 @@
"fontFamily": "Font family",
"maxWidth": "Max width",
"maxWidthNotes": "Maximum width of editor content. Enter a number followed by px, ch (characters) or %, e.g. 800px, 80ch or 60%. Leave empty to use the default width.",
"maxWidthInvalid": "Enter a number followed by px, ch or %, e.g. 800px."
"maxWidthInvalid": "Enter a number followed by px, ch or %, e.g. 800px.",
"codeFontFamily": "Code font family",
"codeFontFamilyNotes": "Applies to inline code and code blocks."
},
"codeBlock": {
"title": "Code Block",
"fontSize": "Font size",
"fontFamily": "Font family",
"showLineNumbers": "Show line numbers",
"removeEmptyLines": "Remove empty lines"
},
Expand Down
7 changes: 4 additions & 3 deletions packages/desktop/static/locales/es.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@
"wrapCodeBlocks": "Ajustar texto dentro de bloques de código",
"editorLineWidth": "Define el ancho máximo del área del editor. Se permite una cadena vacía o sufijos de ch (caracteres), px (píxeles) o % (porcentaje)",
"codeFontSize": "Tamaño de fuente en bloque de código, el rango es 12 ~ 18",
"codeFontFamily": "Familia de fuente utilizada en bloque de código",
"codeFontFamily": "Fuente del código. Se aplica al código en línea y a los bloques de código.",
"codeBlockLineNumbers": "Si mostrar los números de línea",
"sourceCodeLineNumbers": "Mostrar números de línea en el modo código fuente",
"trimUnnecessaryCodeBlockEmptyLines": "Recortar las líneas vacías del principio y final en bloque de código",
Expand Down Expand Up @@ -540,12 +540,13 @@
"fontFamily": "Familia de fuente",
"maxWidth": "Ancho máximo",
"maxWidthNotes": "Ancho máximo del contenido del editor. Introduce un número seguido de px, ch (caracteres) o %, por ejemplo 800px, 80ch o 60%. Déjalo vacío para usar el ancho predeterminado.",
"maxWidthInvalid": "Introduce un número seguido de px, ch o %, por ejemplo 800px."
"maxWidthInvalid": "Introduce un número seguido de px, ch o %, por ejemplo 800px.",
"codeFontFamily": "Fuente del código",
"codeFontFamilyNotes": "Se aplica al código en línea y a los bloques de código."
},
"codeBlock": {
"title": "Bloque de Código",
"fontSize": "Tamaño de fuente",
"fontFamily": "Familia de fuente",
"showLineNumbers": "Mostrar números de línea",
"removeEmptyLines": "Eliminar líneas vacías"
},
Expand Down
7 changes: 4 additions & 3 deletions packages/desktop/static/locales/fr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@
"wrapCodeBlocks": "Retour à la ligne dans les blocs de code",
"editorLineWidth": "Définit la largeur maximale de la zone d'édition. Une chaîne vide ou des suffixes de ch (caractères), px (pixels) ou % (pourcentage) sont autorisés",
"codeFontSize": "Taille de police dans le bloc de code, la plage est de 12 ~ 18",
"codeFontFamily": "Famille de police utilisée dans le bloc de code",
"codeFontFamily": "Police du code. S’applique au code en ligne et aux blocs de code.",
"codeBlockLineNumbers": "Afficher les numéros de ligne",
"sourceCodeLineNumbers": "Afficher les numéros de ligne en mode code source",
"trimUnnecessaryCodeBlockEmptyLines": "Supprimer les lignes vides au début et à la fin du bloc de code",
Expand Down Expand Up @@ -540,12 +540,13 @@
"fontFamily": "Famille de police",
"maxWidth": "Largeur maximale",
"maxWidthNotes": "Largeur maximale du contenu de l'éditeur. Saisissez un nombre suivi de px, ch (caractères) ou %, par exemple 800px, 80ch ou 60%. Laissez vide pour utiliser la largeur par défaut.",
"maxWidthInvalid": "Saisissez un nombre suivi de px, ch ou %, par exemple 800px."
"maxWidthInvalid": "Saisissez un nombre suivi de px, ch ou %, par exemple 800px.",
"codeFontFamily": "Police du code",
"codeFontFamilyNotes": "S’applique au code en ligne et aux blocs de code."
},
"codeBlock": {
"title": "Bloc de code",
"fontSize": "Taille de police",
"fontFamily": "Famille de police",
"showLineNumbers": "Afficher les numéros de ligne",
"removeEmptyLines": "Supprimer les lignes vides"
},
Expand Down
7 changes: 4 additions & 3 deletions packages/desktop/static/locales/ja.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@
"wrapCodeBlocks": "コードブロック内でテキストを折り返す",
"editorLineWidth": "エディターエリアの最大幅を定義します。空文字列または ch (文字)、px (ピクセル)、% (パーセント) の接尾辞が許可されます",
"codeFontSize": "コードブロックのフォントサイズ、範囲は 12〜18",
"codeFontFamily": "コードブロックで使用されるフォントファミリー",
"codeFontFamily": "コードのフォント：インラインコードとコードブロックに適用されます。",
"codeBlockLineNumbers": "行番号を表示するかどうか",
"sourceCodeLineNumbers": "ソースコードモードで行番号を表示",
"trimUnnecessaryCodeBlockEmptyLines": "コードブロックの最初と最後の空行をトリミング",
Expand Down Expand Up @@ -540,12 +540,13 @@
"fontFamily": "フォントファミリー",
"maxWidth": "最大幅",
"maxWidthNotes": "エディターコンテンツの最大幅。数値の後に単位 px、ch (文字数)、% のいずれかを付けて入力します (例 : 800px、80ch、60%)。空欄の場合は既定の幅を使用します。",
"maxWidthInvalid": "数値の後に px、ch、% のいずれかを付けて入力してください (例 : 800px)。"
"maxWidthInvalid": "数値の後に px、ch、% のいずれかを付けて入力してください (例 : 800px)。",
"codeFontFamily": "コードのフォント",
"codeFontFamilyNotes": "インラインコードとコードブロックに適用されます。"
},
"codeBlock": {
"title": "コードブロック",
"fontSize": "フォントサイズ",
"fontFamily": "フォントファミリー",
"showLineNumbers": "行番号を表示",
"removeEmptyLines": "空行を削除"
},
Expand Down
7 changes: 4 additions & 3 deletions packages/desktop/static/locales/ko.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@
"wrapCodeBlocks": "코드 블록 내에서 텍스트 줄바꿈",
"editorLineWidth": "편집기 영역의 최대 너비를 정의합니다. 빈 문자열 또는 ch(문자), px(픽셀), %(백분율) 접미사가 허용됩니다",
"codeFontSize": "코드 블록의 글꼴 크기, 범위는 12~18",
"codeFontFamily": "코드 블록에서 사용되는 글꼴 패밀리",
"codeFontFamily": "코드 글꼴：인라인 코드와 코드 블록에 적용됩니다.",
"codeBlockLineNumbers": "줄 번호를 표시할지 여부",
"sourceCodeLineNumbers": "소스 코드 모드에서 줄 번호 표시",
"trimUnnecessaryCodeBlockEmptyLines": "코드 블록의 시작과 끝에 있는 빈 줄 제거",
Expand Down Expand Up @@ -540,12 +540,13 @@
"fontFamily": "글꼴 패밀리",
"maxWidth": "최대 너비",
"maxWidthNotes": "편집기 콘텐츠의 최대 너비입니다. 숫자 뒤에 px, ch(문자 수) 또는 % 단위를 붙여 입력하세요(예: 800px, 80ch, 60%). 비워 두면 기본 너비를 사용합니다.",
"maxWidthInvalid": "숫자 뒤에 px, ch 또는 %를 붙여 입력하세요(예: 800px)."
"maxWidthInvalid": "숫자 뒤에 px, ch 또는 %를 붙여 입력하세요(예: 800px).",
"codeFontFamily": "코드 글꼴",
"codeFontFamilyNotes": "인라인 코드와 코드 블록에 적용됩니다."
},
"codeBlock": {
"title": "코드 블록",
"fontSize": "글꼴 크기",
"fontFamily": "글꼴 패밀리",
"showLineNumbers": "줄 번호 보기",
"removeEmptyLines": "빈 줄 제거"
},
Expand Down
7 changes: 4 additions & 3 deletions packages/desktop/static/locales/nl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@
"wrapCodeBlocks": "Tekst terugloop in codeblokken",
"editorLineWidth": "Maximale breedte van het editorgebied",
"codeFontSize": "Lettergrootte in codeblokken (12-18)",
"codeFontFamily": "Lettertype voor codeblokken",
"codeFontFamily": "Lettertype voor code. Van toepassing op inlinecode en codeblokken.",
"codeBlockLineNumbers": "Regelnummers tonen",
"sourceCodeLineNumbers": "Regelnummers tonen in broncodeweergave",
"trimUnnecessaryCodeBlockEmptyLines": "Lege regels aan begin en einde van codeblokken verwijderen",
Expand Down Expand Up @@ -540,12 +540,13 @@
"fontFamily": "Lettertypefamilie",
"maxWidth": "Maximale breedte",
"maxWidthNotes": "Maximale breedte van editorinhoud. Voer een getal in gevolgd door px, ch (tekens) of %, bijvoorbeeld 800px, 80ch of 60%. Laat leeg om de standaardbreedte te gebruiken.",
"maxWidthInvalid": "Voer een getal in gevolgd door px, ch of %, bijvoorbeeld 800px."
"maxWidthInvalid": "Voer een getal in gevolgd door px, ch of %, bijvoorbeeld 800px.",
"codeFontFamily": "Lettertype voor code",
"codeFontFamilyNotes": "Van toepassing op inlinecode en codeblokken."
},
"codeBlock": {
"title": "Codeblok",
"fontSize": "Lettergrootte",
"fontFamily": "Lettertypefamilie",
"showLineNumbers": "Regelnummers tonen",
"removeEmptyLines": "Lege regels verwijderen"
},
Expand Down
7 changes: 4 additions & 3 deletions packages/desktop/static/locales/pt.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@
"wrapCodeBlocks": "Quebrar texto dentro de blocos de código",
"editorLineWidth": "Define a largura máxima da área do editor. Uma string vazia ou sufixos de ch (caracteres), px (pixels) ou % (porcentagem) são permitidos",
"codeFontSize": "Tamanho da fonte no bloco de código, o intervalo é 12 ~ 18",
"codeFontFamily": "Família de fonte usada no bloco de código",
"codeFontFamily": "Fonte do código. Aplica-se ao código em linha e aos blocos de código.",
"codeBlockLineNumbers": "Se mostrar os números de linha",
"sourceCodeLineNumbers": "Mostrar números de linha no modo código fonte",
"trimUnnecessaryCodeBlockEmptyLines": "Aparar as linhas vazias do início e fim no bloco de código",
Expand Down Expand Up @@ -540,12 +540,13 @@
"fontFamily": "Família da fonte",
"maxWidth": "Largura máxima",
"maxWidthNotes": "Largura máxima do conteúdo do editor. Digite um número seguido de px, ch (caracteres) ou %, por exemplo 800px, 80ch ou 60%. Deixe vazio para usar a largura padrão.",
"maxWidthInvalid": "Digite um número seguido de px, ch ou %, por exemplo 800px."
"maxWidthInvalid": "Digite um número seguido de px, ch ou %, por exemplo 800px.",
"codeFontFamily": "Fonte do código",
"codeFontFamilyNotes": "Aplica-se ao código em linha e aos blocos de código."
},
"codeBlock": {
"title": "Bloco de Código",
"fontSize": "Tamanho da fonte",
"fontFamily": "Família da fonte",
"showLineNumbers": "Mostrar números de linha",
"removeEmptyLines": "Remover linhas vazias"
},
Expand Down
7 changes: 4 additions & 3 deletions packages/desktop/static/locales/ru.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@
"wrapCodeBlocks": "Переносить текст внутри блоков кода",
"editorLineWidth": "Максимальная ширина области редактора. Допускается пустая строка или суффиксы ch (символы), px (пиксели) или % (проценты)",
"codeFontSize": "Размер шрифта в блоке кода, диапазон 12 ~ 18",
"codeFontFamily": "Семейство шрифтов в блоке кода",
"codeFontFamily": "Шрифт кода. Применяется к встроенному коду и блокам кода.",
"codeBlockLineNumbers": "Показывать номера строк",
"sourceCodeLineNumbers": "Показывать номера строк в режиме исходного кода",
"trimUnnecessaryCodeBlockEmptyLines": "Обрезать пустые строки в начале и конце блока кода",
Expand Down Expand Up @@ -540,12 +540,13 @@
"fontFamily": "Семейство шрифтов",
"maxWidth": "Макс. ширина",
"maxWidthNotes": "Максимальная ширина содержимого редактора. Введите число с суффиксом px, ch (символы) или %, например 800px, 80ch или 60%. Оставьте пустым для ширины по умолчанию.",
"maxWidthInvalid": "Введите число с суффиксом px, ch или %, например 800px."
"maxWidthInvalid": "Введите число с суффиксом px, ch или %, например 800px.",
"codeFontFamily": "Шрифт кода",
"codeFontFamilyNotes": "Применяется к встроенному коду и блокам кода."
},
"codeBlock": {
"title": "Блок кода",
"fontSize": "Размер шрифта",
"fontFamily": "Семейство шрифтов",
"showLineNumbers": "Показывать номера строк",
"removeEmptyLines": "Удалять пустые строки"
},
Expand Down
7 changes: 4 additions & 3 deletions packages/desktop/static/locales/tr.json
View file
Open in desktop
Loading
Loading