openscad-docsgen 2.0.45__tar.gz → 2.0.47__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (18) hide show
  1. {openscad_docsgen-2.0.45 → openscad_docsgen-2.0.47}/PKG-INFO +1 -1
  2. {openscad_docsgen-2.0.45 → openscad_docsgen-2.0.47}/openscad_docsgen/blocks.py +5 -4
  3. {openscad_docsgen-2.0.45 → openscad_docsgen-2.0.47}/openscad_docsgen/parser.py +4 -7
  4. {openscad_docsgen-2.0.45 → openscad_docsgen-2.0.47}/openscad_docsgen/target_wiki.py +0 -20
  5. {openscad_docsgen-2.0.45 → openscad_docsgen-2.0.47}/pyproject.toml +1 -1
  6. {openscad_docsgen-2.0.45 → openscad_docsgen-2.0.47}/.gitignore +0 -0
  7. {openscad_docsgen-2.0.45 → openscad_docsgen-2.0.47}/LICENSE +0 -0
  8. {openscad_docsgen-2.0.45 → openscad_docsgen-2.0.47}/README.rst +0 -0
  9. {openscad_docsgen-2.0.45 → openscad_docsgen-2.0.47}/WRITING_DOCS.md +0 -0
  10. {openscad_docsgen-2.0.45 → openscad_docsgen-2.0.47}/openscad_docsgen/__init__.py +0 -0
  11. {openscad_docsgen-2.0.45 → openscad_docsgen-2.0.47}/openscad_docsgen/errorlog.py +0 -0
  12. {openscad_docsgen-2.0.45 → openscad_docsgen-2.0.47}/openscad_docsgen/filehashes.py +0 -0
  13. {openscad_docsgen-2.0.45 → openscad_docsgen-2.0.47}/openscad_docsgen/imagemanager.py +0 -0
  14. {openscad_docsgen-2.0.45 → openscad_docsgen-2.0.47}/openscad_docsgen/mdimggen.py +0 -0
  15. {openscad_docsgen-2.0.45 → openscad_docsgen-2.0.47}/openscad_docsgen/target.py +0 -0
  16. {openscad_docsgen-2.0.45 → openscad_docsgen-2.0.47}/openscad_docsgen/target_githubwiki.py +0 -0
  17. {openscad_docsgen-2.0.45 → openscad_docsgen-2.0.47}/openscad_docsgen/utils.py +0 -0
  18. {openscad_docsgen-2.0.45 → openscad_docsgen-2.0.47}/setup.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: openscad_docsgen
3
- Version: 2.0.45
3
+ Version: 2.0.47
4
4
  Summary: A processor to generate Markdown code documentation with images from OpenSCAD source comments.
5
5
  Project-URL: Homepage, https://github.com/belfryscad/openscad_docsgen
6
6
  Project-URL: Repository, https://github.com/belfryscad/openscad_docsgen
@@ -99,10 +99,10 @@ class GenericBlock(object):
99
99
  item = controller.items_by_name[name]
100
100
  oline += item.get_link(target, currfile=self.origin.file, literalize=literalize, html=html)
101
101
  elif name in controller.definitions:
102
- oline += target.get_link(name, anchor=name.lower(), file=controller.GLOSSARYFILE, literalize=literalize, html=html)
102
+ oline += target.get_link(name, anchor=name.lower(), file="Glossary", literalize=literalize, html=html)
103
103
  elif name in controller.defn_aliases:
104
- name = controller.defn_aliases[name]
105
- oline += target.get_link(name, anchor=name.lower(), file=controller.GLOSSARYFILE, literalize=literalize, html=html)
104
+ term = controller.defn_aliases[name]
105
+ oline += target.get_link(name, anchor=term.lower(), file="Glossary", literalize=literalize, html=html)
106
106
  else:
107
107
  print(controller.definitions)
108
108
  msg = "Invalid Link {{{{{0}}}}}".format(name)
@@ -274,7 +274,8 @@ class DefinitionsBlock(GenericBlock):
274
274
  key: self.parse_links(info[1], controller, target, html=True)
275
275
  for key, info in self.definitions.items()
276
276
  }
277
- out.extend(target.definition_list(terms, defs))
277
+ for term in terms:
278
+ out.extend(target.markdown_block(["{}: {}".format(term.title(), defs[term])]))
278
279
  out.append("")
279
280
  return out
280
281
 
@@ -697,7 +697,7 @@ class DocsGenParser(object):
697
697
  for key, info in self.definitions.items():
698
698
  keys, defn = info
699
699
  blk = self.file_blocks[0]
700
- defn = blk.parse_links(defn, self, self.target, html=True)
700
+ defn = blk.parse_links(defn, self, self.target, html=False)
701
701
  self.definitions[key] = (keys, defn)
702
702
  if not self.quiet:
703
703
  print("")
@@ -838,14 +838,11 @@ class DocsGenParser(object):
838
838
  for word in sorted_words:
839
839
  ltr = word[0].upper()
840
840
  if old_ltr != ltr:
841
- if old_ltr:
842
- out.extend(target.definition_list_end())
843
- out.extend(target.header(ltr.upper(), lev=3))
844
- out.extend(target.definition_list_start())
841
+ out.extend(target.header(ltr.upper(), lev=2))
845
842
  old_ltr = ltr
846
843
  defn = defs[word.lower()]
847
- out.extend(target.definition_list_item(word, defn))
848
- out.extend(target.definition_list_end())
844
+ out.extend(target.header(word.title(), lev=3))
845
+ out.extend(target.markdown_block([defn]))
849
846
  out = target.postprocess(out)
850
847
  outfile = os.path.join(target.docs_dir, self.GLOSSARYFILE)
851
848
  if not self.quiet:
@@ -193,26 +193,6 @@ class Target_Wiki(object):
193
193
  out.extend(self.numbered_list_end())
194
194
  return out
195
195
 
196
- def definition_list_start(self):
197
- return ["<dl>"]
198
-
199
- def definition_list_item(self, word, defn):
200
- out = ["<dt>{}</dt>".format(word.title())]
201
- out += ["<dd>"]
202
- out.append(defn)
203
- out += ["</dd>"]
204
- return out
205
-
206
- def definition_list_end(self):
207
- return ["</dl>", ""]
208
-
209
- def definition_list(self, words, defs):
210
- out = self.definition_list_start()
211
- for word in words:
212
- out.extend(self.definition_list_item(word, defs[word.lower()]))
213
- out.extend(self.definition_list_end())
214
- return out
215
-
216
196
  def table(self, headers, rows):
217
197
  out = []
218
198
  hcells = []
@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
4
4
 
5
5
  [project]
6
6
  name = "openscad_docsgen"
7
- version = "2.0.45"
7
+ version = "2.0.47"
8
8
  authors = [
9
9
  { name="Revar Desmera", email="revarbat@gmail.com" },
10
10
  ]