commit aca4e3bc9aa65c0b714862493e6a832a0ad1bb15
Author: Juergen Spitzmueller <[email protected]>
Date: Tue Nov 25 17:28:37 2025 +0100
Support two more shorthands ("- and "=) for the languages that provide them
File format change this time
---
development/FORMAT | 6 +
lib/languages | 416 ++++++++++++++++++++++++++++++++++++++++
lib/layouts/stdspecialchars.inc | 4 +-
lib/lyx2lyx/lyx_2_6.py | 88 ++++++++-
po/lyx_pot.py | 12 ++
src/version.h | 4 +-
6 files changed, 524 insertions(+), 6 deletions(-)
diff --git a/development/FORMAT b/development/FORMAT
index 3c3818c999..45ba47d9ec 100644
--- a/development/FORMAT
+++ b/development/FORMAT
@@ -7,6 +7,12 @@ changes happened in particular if possible. A good example
would be
-----------------------
+2025-11-25 Jürgen Spitzmüller <[email protected]>
+ * Format incremented to 648:
+ New (language-specific) SpecialChars extrasofthyphen
+ and breakabledash that are supported in some languages
+ via babelshorthands ("- and "=).
+
2025-10-21 Jürgen Spitzmüller <[email protected]>
* Format incremented to 647:
Rename inset newpage to inset textbreak.
diff --git a/lib/languages b/lib/languages
index bd8d9acc83..f5e2387575 100644
--- a/lib/languages
+++ b/lib/languages
@@ -187,6 +187,19 @@ Language afrikaans
DateFormats "dd MMMM yyyy|dd MMM yyyy|yyyy/MM/dd"
LangCode af_ZA
SupportedBy refstyle
+ SpecialChar extrasofthyphen
+ Type formatting
+ MenuString "Additional Hyphenation Point|y"
+ Tooltip "Hyphenation point that keeps predefined hyphenation
possibilities"
+ LyXOutput 0x2010
+ LatexOutput \"-
+ IsLetter 1
+ XHTMLOutput ­
+ CanBreakAfter 1
+ Font
+ Color textlabel2
+ EndFont
+ End
SpecialChar breakableslash
LaTeXOutput \"/
End
@@ -369,6 +382,33 @@ Language austrian
LangCode de
LangVariety alt
SupportedBy refstyle,zref
+ SpecialChar extrasofthyphen
+ Type formatting
+ MenuString "Additional Hyphenation Point|y"
+ Tooltip "Hyphenation point that keeps predefined hyphenation
possibilities"
+ LyXOutput 0x2010
+ LatexOutput \"-
+ IsLetter 1
+ XHTMLOutput ­
+ CanBreakAfter 1
+ Font
+ Color textlabel2
+ EndFont
+ End
+ SpecialChar breakabledash
+ Type specialchar
+ MenuString "Hyphen with Additional Hyphenation Point|y"
+ Tooltip "Breakable hyphen that keeps predefined hyphenation
possibilities"
+ LyXOutput 0x2010
+ LatexOutput \"=
+ IsLetter 1
+ PlaintextOutput -
+ XHTMLOutput -
+ CanBreakAfter 1
+ Font
+ Color textlabel1
+ EndFont
+ End
SpecialChar breakableslash
LaTeXOutput \"/
End
@@ -400,6 +440,33 @@ Language naustrian
DateFormats "dd. MMMM yyyy|dd. MMM yyyy|dd.MM.yyyy"
LangCode de_AT
SupportedBy refstyle,zref
+ SpecialChar extrasofthyphen
+ Type formatting
+ MenuString "Additional Hyphenation Point|y"
+ Tooltip "Hyphenation point that keeps predefined hyphenation
possibilities"
+ LyXOutput 0x2010
+ LatexOutput \"-
+ IsLetter 1
+ XHTMLOutput ­
+ CanBreakAfter 1
+ Font
+ Color textlabel2
+ EndFont
+ End
+ SpecialChar breakabledash
+ Type specialchar
+ MenuString "Hyphen with Additional Hyphenation Point|y"
+ Tooltip "Breakable hyphen that keeps predefined hyphenation
possibilities"
+ LyXOutput 0x2010
+ LatexOutput \"=
+ IsLetter 1
+ PlaintextOutput -
+ XHTMLOutput -
+ CanBreakAfter 1
+ Font
+ Color textlabel1
+ EndFont
+ End
SpecialChar breakableslash
LaTeXOutput \"/
End
@@ -485,6 +552,33 @@ Language belarusian
FontEncoding T2A
DateFormats "dd MMMM yyyy|d MMM yyyy|d.M.yyyy"
LangCode be_BY
+ SpecialChar extrasofthyphen
+ Type formatting
+ MenuString "Additional Hyphenation Point|y"
+ Tooltip "Hyphenation point that keeps predefined hyphenation
possibilities"
+ LyXOutput 0x2010
+ LatexOutput \"-
+ IsLetter 1
+ XHTMLOutput ­
+ CanBreakAfter 1
+ Font
+ Color textlabel2
+ EndFont
+ End
+ SpecialChar breakabledash
+ Type specialchar
+ MenuString "Hyphen with Additional Hyphenation Point|y"
+ Tooltip "Breakable hyphen that keeps predefined hyphenation
possibilities"
+ LyXOutput 0x2010
+ LatexOutput \"=
+ IsLetter 1
+ PlaintextOutput -
+ XHTMLOutput -
+ CanBreakAfter 1
+ Font
+ Color textlabel1
+ EndFont
+ End
SpecialChar nobreakdash
LaTeXOutput \"~
NeedProtect 0
@@ -536,6 +630,19 @@ Language brazilian
DateFormats "d 'de' MMMM 'de' yyyy|d 'de' MMM 'de' yyyy|dd/MM/yyyy"
LangCode pt_BR
SupportedBy cleveref,refstyle,zref
+ SpecialChar extrasofthyphen
+ Type formatting
+ MenuString "Additional Hyphenation Point|y"
+ Tooltip "Hyphenation point that keeps predefined hyphenation
possibilities"
+ LyXOutput 0x2010
+ LatexOutput \"-
+ IsLetter 1
+ XHTMLOutput ­
+ CanBreakAfter 1
+ Font
+ Color textlabel2
+ EndFont
+ End
SpecialChar allowbreak
LaTeXOutput \"\"
Requires ""
@@ -748,6 +855,19 @@ Language dutch
DateFormats "d MMMM yyyy|d MMM yyyy|d-M-yyyy"
LangCode nl_NL
SupportedBy cleveref,zref
+ SpecialChar extrasofthyphen
+ Type formatting
+ MenuString "Additional Hyphenation Point|y"
+ Tooltip "Hyphenation point that keeps predefined hyphenation
possibilities"
+ LyXOutput 0x2010
+ LatexOutput \"-
+ IsLetter 1
+ XHTMLOutput ­
+ CanBreakAfter 1
+ Font
+ Color textlabel2
+ EndFont
+ End
SpecialChar breakableslash
LaTeXOutput \"/
End
@@ -908,6 +1028,33 @@ Language georgian
Encoding utf8
FontEncoding T8M
LangCode ka_GE
+ SpecialChar extrasofthyphen
+ Type formatting
+ MenuString "Additional Hyphenation Point|y"
+ Tooltip "Hyphenation point that keeps predefined hyphenation
possibilities"
+ LyXOutput 0x2010
+ LatexOutput \"-
+ IsLetter 1
+ XHTMLOutput ­
+ CanBreakAfter 1
+ Font
+ Color textlabel2
+ EndFont
+ End
+ SpecialChar breakabledash
+ Type specialchar
+ MenuString "Hyphen with Additional Hyphenation Point|y"
+ Tooltip "Breakable hyphen that keeps predefined hyphenation
possibilities"
+ LyXOutput 0x2010
+ LatexOutput \"=
+ IsLetter 1
+ PlaintextOutput -
+ XHTMLOutput -
+ CanBreakAfter 1
+ Font
+ Color textlabel1
+ EndFont
+ End
SpecialChar nobreakdash
LaTeXOutput \"~
NeedProtect 0
@@ -937,6 +1084,33 @@ Language german
LangCode de
LangVariety alt
SupportedBy cleveref,refstyle,zref
+ SpecialChar extrasofthyphen
+ Type formatting
+ MenuString "Additional Hyphenation Point|y"
+ Tooltip "Hyphenation point that keeps predefined hyphenation
possibilities"
+ LyXOutput 0x2010
+ LatexOutput \"-
+ IsLetter 1
+ XHTMLOutput ­
+ CanBreakAfter 1
+ Font
+ Color textlabel2
+ EndFont
+ End
+ SpecialChar breakabledash
+ Type specialchar
+ MenuString "Hyphen with Additional Hyphenation Point|y"
+ Tooltip "Breakable hyphen that keeps predefined hyphenation
possibilities"
+ LyXOutput 0x2010
+ LatexOutput \"=
+ IsLetter 1
+ PlaintextOutput -
+ XHTMLOutput -
+ CanBreakAfter 1
+ Font
+ Color textlabel1
+ EndFont
+ End
SpecialChar breakableslash
LaTeXOutput \"/
End
@@ -968,6 +1142,33 @@ Language ngerman
DateFormats "dd. MMMM yyyy|dd. MMM yyyy|dd.MM.yyyy"
LangCode de_DE
SupportedBy cleveref,refstyle,zref
+ SpecialChar extrasofthyphen
+ Type formatting
+ MenuString "Additional Hyphenation Point|y"
+ Tooltip "Hyphenation point that keeps predefined hyphenation
possibilities"
+ LyXOutput 0x2010
+ LatexOutput \"-
+ IsLetter 1
+ XHTMLOutput ­
+ CanBreakAfter 1
+ Font
+ Color textlabel2
+ EndFont
+ End
+ SpecialChar breakabledash
+ Type specialchar
+ MenuString "Hyphen with Additional Hyphenation Point|y"
+ Tooltip "Breakable hyphen that keeps predefined hyphenation
possibilities"
+ LyXOutput 0x2010
+ LatexOutput \"=
+ IsLetter 1
+ PlaintextOutput -
+ XHTMLOutput -
+ CanBreakAfter 1
+ Font
+ Color textlabel1
+ EndFont
+ End
SpecialChar breakableslash
LaTeXOutput \"/
End
@@ -1002,6 +1203,33 @@ Language german-ch
DateFormats "dd. MMMM yyyy|dd. MMM yyyy|dd.MM.yyyy"
LangCode de_CH
SupportedBy zref
+ SpecialChar extrasofthyphen
+ Type formatting
+ MenuString "Additional Hyphenation Point|y"
+ Tooltip "Hyphenation point that keeps predefined hyphenation
possibilities"
+ LyXOutput 0x2010
+ LatexOutput \"-
+ IsLetter 1
+ XHTMLOutput ­
+ CanBreakAfter 1
+ Font
+ Color textlabel2
+ EndFont
+ End
+ SpecialChar breakabledash
+ Type specialchar
+ MenuString "Hyphen with Additional Hyphenation Point|y"
+ Tooltip "Breakable hyphen that keeps predefined hyphenation
possibilities"
+ LyXOutput 0x2010
+ LatexOutput \"=
+ IsLetter 1
+ PlaintextOutput -
+ XHTMLOutput -
+ CanBreakAfter 1
+ Font
+ Color textlabel1
+ EndFont
+ End
SpecialChar breakableslash
LaTeXOutput \"/
End
@@ -1035,6 +1263,33 @@ Language german-ch-old
DateFormats "dd. MMMM yyyy|dd. MMM yyyy|dd.MM.yyyy"
LangCode de_CH
SupportedBy zref
+ SpecialChar extrasofthyphen
+ Type formatting
+ MenuString "Additional Hyphenation Point|y"
+ Tooltip "Hyphenation point that keeps predefined hyphenation
possibilities"
+ LyXOutput 0x2010
+ LatexOutput \"-
+ IsLetter 1
+ XHTMLOutput ­
+ CanBreakAfter 1
+ Font
+ Color textlabel2
+ EndFont
+ End
+ SpecialChar breakabledash
+ Type specialchar
+ MenuString "Hyphen with Additional Hyphenation Point|y"
+ Tooltip "Breakable hyphen that keeps predefined hyphenation
possibilities"
+ LyXOutput 0x2010
+ LatexOutput \"=
+ IsLetter 1
+ PlaintextOutput -
+ XHTMLOutput -
+ CanBreakAfter 1
+ Font
+ Color textlabel1
+ EndFont
+ End
SpecialChar breakableslash
LaTeXOutput \"/
End
@@ -1466,6 +1721,33 @@ Language mongolian
DateFormats "yyyy оны M сарын d|d-M-yyyy|dd-MM-yyyy"
LangCode mn_MN
Provides textcyrillic
+ SpecialChar extrasofthyphen
+ Type formatting
+ MenuString "Additional Hyphenation Point|y"
+ Tooltip "Hyphenation point that keeps predefined hyphenation
possibilities"
+ LyXOutput 0x2010
+ LatexOutput \"-
+ IsLetter 1
+ XHTMLOutput ­
+ CanBreakAfter 1
+ Font
+ Color textlabel2
+ EndFont
+ End
+ SpecialChar breakabledash
+ Type specialchar
+ MenuString "Hyphen with Additional Hyphenation Point|y"
+ Tooltip "Breakable hyphen that keeps predefined hyphenation
possibilities"
+ LyXOutput 0x2010
+ LatexOutput \"=
+ IsLetter 1
+ PlaintextOutput -
+ XHTMLOutput -
+ CanBreakAfter 1
+ Font
+ Color textlabel1
+ EndFont
+ End
SpecialChar nobreakdash
LaTeXOutput \"~
NeedProtect 0
@@ -1571,6 +1853,33 @@ Language oldrussian
Encoding koi8-r
FontEncoding T2A
LangCode ru_petr1708
+ SpecialChar extrasofthyphen
+ Type formatting
+ MenuString "Additional Hyphenation Point|y"
+ Tooltip "Hyphenation point that keeps predefined hyphenation
possibilities"
+ LyXOutput 0x2010
+ LatexOutput \"-
+ IsLetter 1
+ XHTMLOutput ­
+ CanBreakAfter 1
+ Font
+ Color textlabel2
+ EndFont
+ End
+ SpecialChar breakabledash
+ Type specialchar
+ MenuString "Hyphen with Additional Hyphenation Point|y"
+ Tooltip "Breakable hyphen that keeps predefined hyphenation
possibilities"
+ LyXOutput 0x2010
+ LatexOutput \"=
+ IsLetter 1
+ PlaintextOutput -
+ XHTMLOutput -
+ CanBreakAfter 1
+ Font
+ Color textlabel1
+ EndFont
+ End
SpecialChar nobreakdash
LaTeXOutput \"~
NeedProtect 0
@@ -1609,6 +1918,19 @@ Language polish
FontEncoding QX|T1|OT1
DateFormats "d MMMM yyyy|d MMM yyyy|yyyy-MM-dd"
LangCode pl_PL
+ SpecialChar extrasofthyphen
+ Type formatting
+ MenuString "Additional Hyphenation Point|y"
+ Tooltip "Hyphenation point that keeps predefined hyphenation
possibilities"
+ LyXOutput 0x2010
+ LatexOutput \"-
+ IsLetter 1
+ XHTMLOutput ­
+ CanBreakAfter 1
+ Font
+ Color textlabel2
+ EndFont
+ End
SpecialChar allowbreak
LaTeXOutput \"\"
Requires ""
@@ -1632,6 +1954,19 @@ Language portuguese
DateFormats "d 'de' MMMM 'de' yyyy|d 'de' MMM 'de' yyyy|yyyy/MM/dd"
LangCode pt_PT
SupportedBy refstyle,zref
+ SpecialChar extrasofthyphen
+ Type formatting
+ MenuString "Additional Hyphenation Point|y"
+ Tooltip "Hyphenation point that keeps predefined hyphenation
possibilities"
+ LyXOutput 0x2010
+ LatexOutput \"-
+ IsLetter 1
+ XHTMLOutput ­
+ CanBreakAfter 1
+ Font
+ Color textlabel2
+ EndFont
+ End
SpecialChar allowbreak
LaTeXOutput \"\"
Requires ""
@@ -1692,6 +2027,33 @@ Language russian
LangCode ru_RU
Provides textcyrillic
SupportedBy cleveref,zref
+ SpecialChar extrasofthyphen
+ Type formatting
+ MenuString "Additional Hyphenation Point|y"
+ Tooltip "Hyphenation point that keeps predefined hyphenation
possibilities"
+ LyXOutput 0x2010
+ LatexOutput \"-
+ IsLetter 1
+ XHTMLOutput ­
+ CanBreakAfter 1
+ Font
+ Color textlabel2
+ EndFont
+ End
+ SpecialChar breakabledash
+ Type specialchar
+ MenuString "Hyphen with Additional Hyphenation Point|y"
+ Tooltip "Breakable hyphen that keeps predefined hyphenation
possibilities"
+ LyXOutput 0x2010
+ LatexOutput \"=
+ IsLetter 1
+ PlaintextOutput -
+ XHTMLOutput -
+ CanBreakAfter 1
+ Font
+ Color textlabel1
+ EndFont
+ End
SpecialChar nobreakdash
LaTeXOutput \"~
NeedProtect 0
@@ -1791,6 +2153,33 @@ Language slovak
FontEncoding T1|OT1
DateFormats "d. MMMM yyyy|d. MMM yyyy|d.M.yyyy"
LangCode sk_SK
+ SpecialChar extrasofthyphen
+ Type formatting
+ MenuString "Additional Hyphenation Point|y"
+ Tooltip "Hyphenation point that keeps predefined hyphenation
possibilities"
+ LyXOutput 0x2010
+ LatexOutput \"-
+ IsLetter 1
+ XHTMLOutput ­
+ CanBreakAfter 1
+ Font
+ Color textlabel2
+ EndFont
+ End
+ SpecialChar breakabledash
+ Type specialchar
+ MenuString "Hyphen with Additional Hyphenation Point|y"
+ Tooltip "Breakable hyphen that keeps predefined hyphenation
possibilities"
+ LyXOutput 0x2010
+ LatexOutput \"=
+ IsLetter 1
+ PlaintextOutput -
+ XHTMLOutput -
+ CanBreakAfter 1
+ Font
+ Color textlabel1
+ EndFont
+ End
SpecialChar nobreakdash
LaTeXOutput \"~
NeedProtect 0
@@ -1988,6 +2377,33 @@ Language ukrainian
LangCode uk_UA
Provides textcyrillic
SupportedBy cleveref
+ SpecialChar extrasofthyphen
+ Type formatting
+ MenuString "Additional Hyphenation Point|y"
+ Tooltip "Hyphenation point that keeps predefined hyphenation
possibilities"
+ LyXOutput 0x2010
+ LatexOutput \"-
+ IsLetter 1
+ XHTMLOutput ­
+ CanBreakAfter 1
+ Font
+ Color textlabel2
+ EndFont
+ End
+ SpecialChar breakabledash
+ Type specialchar
+ MenuString "Hyphen with Additional Hyphenation Point|y"
+ Tooltip "Breakable hyphen that keeps predefined hyphenation
possibilities"
+ LyXOutput 0x2010
+ LatexOutput \"=
+ IsLetter 1
+ PlaintextOutput -
+ XHTMLOutput -
+ CanBreakAfter 1
+ Font
+ Color textlabel1
+ EndFont
+ End
SpecialChar nobreakdash
LaTeXOutput \"~
NeedProtect 0
diff --git a/lib/layouts/stdspecialchars.inc b/lib/layouts/stdspecialchars.inc
index 5a1526266f..1b01570149 100644
--- a/lib/layouts/stdspecialchars.inc
+++ b/lib/layouts/stdspecialchars.inc
@@ -125,8 +125,8 @@ End
SpecialChar softhyphen
Type formatting
- MenuString "Hyphenation Point|H"
- Tooltip "Hyphenation Point"
+ MenuString "Exclusive Hyphenation Point|H"
+ Tooltip "Hyphenation point that overwrites predefined
hyphenation possibilities"
LyXOutput 0x2010
LatexOutput \\-
IsLetter 1
diff --git a/lib/lyx2lyx/lyx_2_6.py b/lib/lyx2lyx/lyx_2_6.py
index e493d5e6fd..44795453ed 100644
--- a/lib/lyx2lyx/lyx_2_6.py
+++ b/lib/lyx2lyx/lyx_2_6.py
@@ -45,7 +45,6 @@ from lyx2lyx_tools import (
# del_value,
# find_complete_lines,
# find_end_of,
-# find_substring,
# find_token_exact,
# find_tokens,
# get_bool_value,
@@ -58,6 +57,7 @@ from parser_tools import (
find_end_of_layout,
find_end_of_sequence,
find_re,
+ find_substring,
find_token,
find_token_backwards,
get_containing_inset,
@@ -658,6 +658,88 @@ def revert_textbreaks(document):
i += 1
continue
+
+def revert_hyphen_shorthands(document):
+ "Revert SpecialChar breakabledash and SpecialChar extrasofthyphen to ERT"
+
+ mainlang = get_value(document.header, "\\language")
+ if mainlang == "":
+ document.warning("Malformed LyX document! No \\language header found!")
+ return
+
+ langs_breakabledash = [
+ "austrian",
+ "naustrian",
+ "belarusian",
+ "georgian",
+ "german",
+ "ngerman",
+ "german-ch",
+ "german-ch-old",
+ "mongolian",
+ "oldrussian",
+ "russian",
+ "slovak",
+ "ukrainian"
+ ]
+
+ langs_extrasofthyphen = [
+ "afrikaans",
+ "austrian",
+ "naustrian",
+ "belarusian",
+ "brazilian",
+ "dutch",
+ "georgian",
+ "german",
+ "ngerman",
+ "german-ch",
+ "german-ch-old",
+ "mongolian",
+ "oldrussian",
+ "polish",
+ "portuguese",
+ "russian",
+ "slovak",
+ "ukrainian"
+ ]
+
+ i = 0
+ while True:
+ i = find_substring(document.body, "\\SpecialChar breakabledash", i)
+ if i == -1:
+ break
+ document.body[i] = document.body[i].replace("\\SpecialChar
breakabledash", "")
+ lang = mainlang
+ l = find_token_backwards(document.body, "\\lang", i) != -1
+ if l > 0:
+ line = document.body[l]
+ tokenend = len("\\lang ")
+ lang = line[tokenend:].strip()
+ if lang in langs_breakabledash:
+ cmd = put_cmd_in_ert("\"=")
+ document.body[i + 1 : i + 1] = cmd
+ i += 1
+ continue
+
+ i = 0
+ while True:
+ i = find_substring(document.body, "\\SpecialChar extrasofthyphen", i)
+ if i == -1:
+ break
+ document.body[i] = document.body[i].replace("\\SpecialChar
extrasofthyphen", "")
+ lang = mainlang
+ l = find_token_backwards(document.body, "\\lang", i) != -1
+ if l > 0:
+ line = document.body[l]
+ tokenend = len("\\lang ")
+ lang = line[tokenend:].strip()
+ if lang in langs_extrasofthyphen:
+ cmd = put_cmd_in_ert("\"-")
+ document.body[i + 1 : i + 1] = cmd
+ i += 1
+ continue
+
##
# Conversion hub
#
@@ -667,11 +749,13 @@ convert = [
[644, [convert_refname]],
[645, []],
[646, []],
- [647, [convert_textbreaks]]
+ [647, [convert_textbreaks]],
+ [648, []]
]
revert = [
+ [647, [revert_hyphen_shorthands]],
[646, [revert_textbreaks]],
[645, [revert_contextual_breaks]],
[644, [revert_mathref]],
diff --git a/po/lyx_pot.py b/po/lyx_pot.py
index 1a6d587b76..b4fd016a79 100755
--- a/po/lyx_pot.py
+++ b/po/lyx_pot.py
@@ -548,6 +548,8 @@ def languages_l10n(input_files, output, base):
'''Generate pot file from lib/languages'''
out = io.open(output, 'w', encoding='utf_8', newline='\n')
GuiName = re.compile(r'^[^#]*GuiName\s+(.*)', re.IGNORECASE)
+ MenuString = re.compile(r'^[^#]*MenuString\S*\s+(.*\S)\s*$', re.IGNORECASE)
+ Tooltip = re.compile(r'^\s*Tooltip\S*\s+(.*\S)\s*$', re.IGNORECASE)
for src in input_files:
descStartLine = -1
@@ -560,6 +562,16 @@ def languages_l10n(input_files, output, base):
string = res.group(1)
writeString(out, src, base, lineno, string)
continue
+ res = MenuString.search(line)
+ if res != None:
+ string = res.group(1)
+ writeString(out, src, base, lineno, string)
+ continue
+ res = Tooltip.search(line)
+ if res != None:
+ string = res.group(1)
+ writeString(out, src, base, lineno, string)
+ continue
out.close()
diff --git a/src/version.h b/src/version.h
index cf76ee8ce3..f64cd916a9 100644
--- a/src/version.h
+++ b/src/version.h
@@ -32,8 +32,8 @@ extern char const * const lyx_version_info;
// Do not remove the comment below, so we get merge conflict in
// independent branches. Instead add your own.
-#define LYX_FORMAT_LYX 647 // spitz: InsetTextbreak
-#define LYX_FORMAT_TEX2LYX 647
+#define LYX_FORMAT_LYX 648 // spitz: shorthands
+#define LYX_FORMAT_TEX2LYX 648
#if LYX_FORMAT_TEX2LYX != LYX_FORMAT_LYX
#ifndef _MSC_VER
--
lyx-cvs mailing list
[email protected]
https://lists.lyx.org/mailman/listinfo/lyx-cvs
