Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 5 additions & 2 deletions source/NVDAObjects/window/winword.py
Original file line number Diff line number Diff line change
Expand Up @@ -843,8 +843,11 @@ def _normalizeFormatField(self,field,extraDetail=False):
# Translators: line spacing of 1.5 lines
field['line-spacing']=pgettext('line spacing value',"1.5 lines")
elif lineSpacingRule==wdLineSpaceExactly:
# Translators: exact (minimum) line spacing
field['line-spacing']=pgettext('line spacing value',"exact")
field['line-spacing'] = pgettext(
'line spacing value',
# Translators: line spacing of exactly x point
"exactly {space:.1f} pt"
).format(space=float(lineSpacingVal))
elif lineSpacingRule==wdLineSpaceAtLeast:
# Translators: line spacing of at least x point
field['line-spacing']=pgettext('line spacing value',"at least %.1f pt")%float(lineSpacingVal)
Expand Down
35 changes: 17 additions & 18 deletions source/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -116,29 +116,28 @@ def restart(disableAddons=False, debugLogging=False):
import subprocess
import winUser
import shellapi
options=[]
try:
sys.argv.remove('--disable-addons')
except ValueError:
pass
try:
sys.argv.remove('--debug-logging')
except ValueError:
pass
for paramToRemove in ("--disable-addons", "--debug-logging", "--ease-of-access"):
try:
sys.argv.remove(paramToRemove)
except ValueError:
pass
options = []
if not hasattr(sys, "frozen"):
options.append(os.path.basename(sys.argv[0]))
if disableAddons:
options.append('--disable-addons')
if debugLogging:
options.append('--debug-logging')
try:
sys.argv.remove("--ease-of-access")
except ValueError:
pass
shellapi.ShellExecute(None, None,
sys.executable,
subprocess.list2cmdline(sys.argv + options),
None,
shellapi.ShellExecute(
hwnd=None,
operation=None,
file=sys.executable,
parameters=subprocess.list2cmdline(options + sys.argv[1:]),
directory=globalVars.appDir,
# #4475: ensure that the first window of the new process is not hidden by providing SW_SHOWNORMAL
winUser.SW_SHOWNORMAL)
showCmd=winUser.SW_SHOWNORMAL
)


def resetConfiguration(factoryDefaults=False):
"""Loads the configuration, installs the correct language support and initialises audio so that it will use the configured synth and speech settings.
Expand Down
4 changes: 2 additions & 2 deletions source/globalCommands.py
Original file line number Diff line number Diff line change
Expand Up @@ -1552,15 +1552,15 @@ def script_reportFormatting(self, gesture):
category=SCRCAT_SYSTEMCARET,
)
def script_reportFormattingAtCaret(self, gesture):
self._reportFormattingHelper(self._getTIAtCaret(), False)
self._reportFormattingHelper(self._getTIAtCaret(True), False)

@script(
# Translators: Input help mode message for show formatting at caret position command.
description=_("Presents, in browse mode, formatting info for the text under the caret."),
category=SCRCAT_SYSTEMCARET,
)
def script_showFormattingAtCaret(self, gesture):
self._reportFormattingHelper(self._getTIAtCaret(), True)
self._reportFormattingHelper(self._getTIAtCaret(True), True)

@script(
description=_(
Expand Down
1 change: 1 addition & 0 deletions user_docs/en/changes.t2t
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ What's New in NVDA
- In Visual Studio, IntelliSense tool tips that provide additional details about the currently selected IntelliSense item are now only reported once. (#11611)
- In Windows 10 Calculator, NVDA will not announce progress of calculations if speak typed characters is disabled. (#9428)
- NVDA no longer crashes when using English US grade 2 and expand to computer Braille at the cursor is on, when displaying certain content such as a URL in Braille. (#11754)
- It is again possible to report formatting information for the focused Excel cell using NVDA+F. (#11914)


== Changes for Developers ==
Expand Down