Merge 9a739b0 into c6b6904

codeofdusk · web-flow · commit 45f7a89490e2 · 2020-03-31T16:12:42.000+10:00
diff --git a/source/config/configSpec.py b/source/config/configSpec.py
@@ -173,6 +173,7 @@
 	reportFontAttributes = boolean(default=false)
 	reportRevisions = boolean(default=true)
 	reportEmphasis = boolean(default=false)
+	reportsuperscriptsAndSubscripts = boolean(default=true)
 	reportColor = boolean(default=False)
 	reportAlignment = boolean(default=false)
 	reportLineSpacing = boolean(default=false)
diff --git a/source/gui/settingsDialogs.py b/source/gui/settingsDialogs.py
@@ -1941,6 +1941,12 @@ def makeSettings(self, settingsSizer):
 		self.fontAttrsCheckBox=fontGroup.addItem(wx.CheckBox(self,label=fontAttributesText))
 		self.fontAttrsCheckBox.SetValue(config.conf["documentFormatting"]["reportFontAttributes"])
 
+		# Translators: This is the label for a checkbox in the
+		# document formatting settings panel.
+		superscriptsAndSubscriptsText = _("Su&perscripts and subscripts")
+		self.superscriptsAndSubscriptsCheckBox = fontGroup.addItem(wx.CheckBox(self, label=superscriptsAndSubscriptsText))
+		self.superscriptsAndSubscriptsCheckBox.SetValue(config.conf["documentFormatting"]["reportsuperscriptsAndSubscripts"])
+
 		# Translators: This is the label for a checkbox in the
 		# document formatting settings panel.
 		emphasisText=_("E&mphasis")
@@ -2145,6 +2151,7 @@ def onSave(self):
 		config.conf["documentFormatting"]["reportFontName"]=self.fontNameCheckBox.IsChecked()
 		config.conf["documentFormatting"]["reportFontSize"]=self.fontSizeCheckBox.IsChecked()
 		config.conf["documentFormatting"]["reportFontAttributes"]=self.fontAttrsCheckBox.IsChecked()
+		config.conf["documentFormatting"]["reportsuperscriptsAndSubscripts"] = self.superscriptsAndSubscriptsCheckBox.IsChecked()
 		config.conf["documentFormatting"]["reportColor"]=self.colorCheckBox.IsChecked()
 		config.conf["documentFormatting"]["reportComments"]=self.commentsCheckBox.IsChecked()
 		config.conf["documentFormatting"]["reportRevisions"]=self.revisionsCheckBox.IsChecked()
diff --git a/source/speech/__init__.py b/source/speech/__init__.py
@@ -2178,6 +2178,7 @@ def getFormatFieldSpeech(  # noqa: C901
 				else _("not hidden")
 			)
 			textList.append(text)
+	if formatConfig["reportsuperscriptsAndSubscripts"]:
 		textPosition=attrs.get("text-position")
 		oldTextPosition=attrsCache.get("text-position") if attrsCache is not None else None
 		if (textPosition or oldTextPosition is not None) and textPosition!=oldTextPosition:
diff --git a/user_docs/en/userGuide.t2t b/user_docs/en/userGuide.t2t
@@ -1690,6 +1690,7 @@ You can configure reporting of:
  - Font name
  - Font size
  - Font attributes
+ - Superscripts and subscripts
  - Emphasis
  - Style
  - Colors

Original file line number	Diff line number	Diff line change
`@@ -2178,6 +2178,7 @@ def getFormatFieldSpeech( # noqa: C901`
`2178`	`2178`	`else _("not hidden")`
`2179`	`2179`	`)`
`2180`	`2180`	`textList.append(text)`
	`2181`	`+ if formatConfig["reportsuperscriptsAndSubscripts"]:`
`2181`	`2182`	`textPosition=attrs.get("text-position")`
`2182`	`2183`	`oldTextPosition=attrsCache.get("text-position") if attrsCache is not None else None`
`2183`	`2184`	`if (textPosition or oldTextPosition is not None) and textPosition!=oldTextPosition:`