Skip to content
Open
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
20 changes: 17 additions & 3 deletions sphinx_exercise/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -100,13 +100,23 @@ def merge_exercises(
**env.sphinx_exercise_registry,
**other.sphinx_exercise_registry,
}

def define_texts(app: Sphinx, config: Config) -> None:
if config.language is not None and config.language_map is not None:
lg = config.language_map[config.language]
if "exercise_title_text" in lg:
config.exercise_title_text = lg["exercise_title_text"]
if "solution_title_text" in lg:
config.solution_title_text = lg["solution_title_text"]


def init_numfig(app: Sphinx, config: Config) -> None:
"""Initialize numfig"""

define_texts(app, config)

config["numfig"] = True
numfig_format = {"exercise": "Exercise %s"}
numfig_format = {"exercise": config.exercise_title_text + " %s"}
# Merge with current sphinx settings
numfig_format.update(config.numfig_format)
config.numfig_format = numfig_format
Expand Down Expand Up @@ -141,9 +151,13 @@ def doctree_read(app: Sphinx, document: Node) -> None:
section_name = node.attributes.get("title")
domain.anonlabels[name] = docname, label
domain.labels[name] = docname, label, section_name



def setup(app: Sphinx) -> Dict[str, Any]:
#Define the extension configuration variables
app.add_config_value("exercise_title_text", "Exercise", "env") # The title of the exercise
app.add_config_value("solution_title_text", "Solution to", "env") # The title of the solution
if not hasattr(app.config, "language_map"):
app.add_config_value("language_map", None, "env") # A map of translated strings
app.add_config_value("hide_solutions", False, "env")

app.connect("config-inited", init_numfig) # event order - 1
Expand Down
6 changes: 4 additions & 2 deletions sphinx_exercise/directive.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,8 @@ class : str,
}

def run(self) -> List[Node]:
self.defaults = {"title_text": "Exercise"}
logger.debug("Running ExerciseDirective: exercise_title_text: " + self.env.config.exercise_title_text)
self.defaults = {"title_text": self.env.config.exercise_title_text}
self.serial_number = self.env.new_serialno()

# Initialise Registry (if needed)
Expand Down Expand Up @@ -216,7 +217,8 @@ class : str,
solution_node = solution_node

def run(self) -> List[Node]:
self.defaults = {"title_text": "Solution to"}
logger.debug("Running SolutionDirective: solution_title_text: " + self.env.config.solution_title_text)
self.defaults = {"title_text": self.env.config.solution_title_text}
target_label = self.arguments[0]
self.serial_number = self.env.new_serialno()

Expand Down