diff --git a/Spexyfile b/Spexyfile index 9e23a7c..774f65b 100644 --- a/Spexyfile +++ b/Spexyfile @@ -6,7 +6,7 @@ # Spexygen: Commands #--------------------------------------------------------------------------- ALIASES += \ -"uid{2}=@addindex \1^^@subsection \1 \1^^
\1 : \2^^" \ +"uid{2}=@addindex \1^^@subsection \1 \1^^
\1: \2^^" \ "uid_litem{1}=
\1
^^" \ "uid_bw_trace=
Backward Traceability
^^" \ "uid_bw_trace{1}=
Backward Traceability
^^" \ diff --git a/doc/DOC_MAN_SPX.pdf b/doc/DOC_MAN_SPX.pdf index 1302ca1..a7df418 100644 Binary files a/doc/DOC_MAN_SPX.pdf and b/doc/DOC_MAN_SPX.pdf differ diff --git a/doc/Doxyfile b/doc/Doxyfile index f521afe..64f10ac 100644 --- a/doc/Doxyfile +++ b/doc/Doxyfile @@ -6,7 +6,7 @@ # Project related configuration options #--------------------------------------------------------------------------- PROJECT_NAME = Spexygen -PROJECT_NUMBER = 2.2.3 +PROJECT_NUMBER = 2.2.4 PROJECT_BRIEF = "Reference Manual" PROJECT_LOGO = $(SPEXYGEN)/spexygen-awesome/img/logo_spexygen.webp PROJECT_ICON = diff --git a/doc/Doxyfile-PDF b/doc/Doxyfile-PDF index 64d0138..e45c310 100644 --- a/doc/Doxyfile-PDF +++ b/doc/Doxyfile-PDF @@ -6,7 +6,7 @@ # Configuration options related to the LateX output #--------------------------------------------------------------------------- PROJECT_NAME = Reference Manual -PROJECT_BRIEF = For Spexygen 2.2.3 +PROJECT_BRIEF = For Spexygen 2.2.4 PROJECT_NUMBER = Document: DOC_MAN_SPX #--------------------------------------------------------------------------- diff --git a/example/Doxyfile b/example/Doxyfile index 1ebcdee..606e98c 100644 --- a/example/Doxyfile +++ b/example/Doxyfile @@ -7,7 +7,7 @@ #--------------------------------------------------------------------------- PROJECT_NAME = Example PROJECT_NUMBER = 0.0.1 -PROJECT_BRIEF = For Spexygen 2.2.2 +PROJECT_BRIEF = For Spexygen 2.2.3 PROJECT_LOGO = $(SPEXYGEN)/spexygen-awesome/img/logo_spexygen.webp PROJECT_ICON = diff --git a/example/Doxyfile-PDF b/example/Doxyfile-PDF index ae18ba9..71d3621 100644 --- a/example/Doxyfile-PDF +++ b/example/Doxyfile-PDF @@ -6,7 +6,7 @@ # Configuration options related to the LateX output #--------------------------------------------------------------------------- PROJECT_NAME = Example -PROJECT_BRIEF = For Spexygen 2.2.2 +PROJECT_BRIEF = For Spexygen 2.2.4 PROJECT_NUMBER = Document: DOC_MAN_EXA #--------------------------------------------------------------------------- diff --git a/setup.py b/setup.py index 8851aba..e3ca3ec 100644 --- a/setup.py +++ b/setup.py @@ -9,7 +9,7 @@ setup( name="spexygen", - version="2.2.3", + version="2.2.4", author="Quantum Leaps", author_email="info@state-machine.com", description="Traceable specifications based on doxygen", diff --git a/spexygen.py b/spexygen.py index 6035345..ebf1724 100644 --- a/spexygen.py +++ b/spexygen.py @@ -47,7 +47,7 @@ class Spexygen: ''' # public class constants - VERSION = 223 + VERSION = 224 UID_DOC = 1 UID_CODE = 2 @@ -92,7 +92,7 @@ def on_gen_fw_trace(self, uid_in, level): "self._uid_traced_list:", self._uid_traced_list) for uid in self._uid_trace_dict.get(uid_in): if uid not in self._uid_traced_list: - self._file.write("%s%s- @tr{%s}: %s\n" + self._file.write("%s%s- @tr{%s}: %s\n" %(self._prefix, Spexygen.LEVELS[level], uid, self._uid_brief_dict[uid])) if level < self._fw_trace_levels: @@ -274,7 +274,7 @@ def gen_bw_trace(self, line): if tr in self._uid_brief_dict: if self._bw_trace == 'brief': self._file.write(line[:j+1]) - self._file.write(f": {self._uid_brief_dict[tr]}") + self._file.write(f": {self._uid_brief_dict[tr]}") self._file.write(line[j+1:]) else: self._file.write(line)