Update json2md.py

docs/Converters/Output/Markdown_docs.md

@@ -0,0 +1,41 @@
+[[/Converters/Output/Mardown_docs]] -- Markdown documents
+
+# Synopsis
+
+~~~
+#output "filename.md" [--no_{classes,globals,modules,objects}|--with_{classes,contents,hyperlinks}]
+~~~
+
+# Description
+
+The markdown document output converter generates a markdown document that tabulates information in the GLM's corresponding JSON file.
+
+## Output options
+
+### `--{no,with}_classes`
+
+The markdown document excludes/includes class information.  By default class information is included if available.  If no objects are present in the file, all classes are included by default unless `--no_classes` is used.  If objects are present, only referenced classes are included by default, unless `--no_classes` is used, in which case no class output is generated, or `--with_classes` is used in which case all class output is generated.
+
+### `--no_globals`
+
+The markdown document excludes global data information.
+
+### `--no_modules`
+
+The markdown document excludes module information.
+
+### `--no_objects`
+
+The markdown document excludes object information.
+
+### `--with_contents`
+
+The markdown document includes a table of contents.
+
+### `--with_hyperlinks`
+
+The markdown document includes hyperlinks to known entities.
+
+# See also
+
+* [[/GLM/Macro/Output]]

gldcore/converters/autotest/test_markdown.glm

@@ -14,6 +14,15 @@ module residential;
 module revenue;
 module tape;
 
-#output "test_markdown.md"
+class test {
+	double x[kW];
+}
+
+object test {
+	name "test_0";
+	x 1.2345 MW;
+}
+
+#output "test_markdown.md" --with_contents --with_hyperlinks
 
 // TODO: check markdown output somehow

gldcore/converters/json2md.py

@@ -10,24 +10,51 @@
 import sys, getopt
 import json
 
-config = {"input":"json","output":"md","options":{}}
+config = {
+	"input" : "json",
+	"output" : "md",
+	"options" : {
+		"--no_modules" : "Omit modules",
+		"--no_globals" : "Omit globals",
+		"--no_objects" : "Omit objects",
+		"--with_classes" : "Include classes",
+		"--no_classes" : "Omit classes",
+		"--with_contents" : "Include table of contents",
+		"--with_hyperlinks" : "Include hyperlinks",
+	}
+}
 
 def help():
     print('Syntax:')
     print(f'{config["input"]}2{config["output"]}.py -i|--ifile <input-file>[,<input-file>[,...]] -o|--ofile <output-file> [options ...]')
-    print(f'  -c|--config    : [OPTIONAL] display converter configuration')
-    print(f'  -i|--ifile     : [REQUIRED] {config["input"]} input file name')
-    print(f'  -o|--ofile     : [REQUIRED] {config["output"]} output file name')
+    print(f'  -c|--config       : [OPTIONAL] display converter configuration')
+    print(f'  -i|--ifile        : [REQUIRED] {config["input"]} input file name')
+    print(f'  -o|--ofile        : [REQUIRED] {config["output"]} output file name')
+    print(f'  --no_classes      : [OPTIONAL] do not output classes')
+    print(f'  --no_globals      : [OPTIONAL] do not output globals')
+    print(f'  --no_modules      : [OPTIONAL] do not output modules')
+    print(f'  --no_objects      : [OPTIONAL] do not output objects')
+    print(f'  --with_classes    : [OPTIONAL] output all classes')
+    print(f'  --with_contents   : [OPTIONAL] output table of contents')
+    print(f'  --with_hyperlinks : [OPTIONAL] add hyperlinks to known entities')
 
 def error(msg):
     print(f'ERROR    [{config["input"]}2{config["output"]}]: {msg}')
     sys.exit(1)
 
 input_file = None
 output_file = None
-options = {}
-
-opts, args = getopt.getopt(sys.argv[1:],"hci:o:",["help","config","ifile=","ofile="])
+options = {
+	"classes" : True,
+	"globals" : True,
+	"modules" : True,
+	"objects" : True,
+	"contents" : False,
+	"hyperlinks" : False,
+}
+
+opts, args = getopt.getopt(sys.argv[1:],"hci:o:",["help","config","ifile=","ofile=",
+	"no_modules","no_globals","no_classes","no_objects","with_classes","with_contents","with_hyperlinks"])
 
 if not opts : 
     help()
@@ -44,6 +71,15 @@ def error(msg):
         input_file = arg.strip()
     elif opt in ("-o", "--ofile"):
         output_file = arg.strip()
+    elif opt in ("--no_classes","--no_globals","--no_modules","--no_objects",
+                 "--with_classes","--with_contents","--with_hyperlinks"):
+        spec = opt.split("_")
+        if spec[0] == "--no" and len(spec) > 1 and spec[1] in options.keys():
+        	options[spec[1]] = False
+        elif spec[0] == "--with" and len(spec) > 1 and spec[1] in options.keys():
+        	options[spec[1]] = True
+        else:
+            error(f"{opt} is not a valid option")
     else:
         error(f"{opt}={arg} is not a valid option");
 
@@ -74,9 +110,18 @@ def row(*args):
 			md.write("| " + " | ".join(args) + " |")
 		md.write("\n")
 
+	def line(text=""):
+		md.write(f"{text}\n")
+
 	def hdr(n,str):
 		md.write(f"{'#'*n} {str}\n\n")
 
+	def link(n):
+		if options["hyperlinks"]:
+			return f"[{n}](#{n.replace(' ','-')}"
+		else:
+			return n
+
 	def get(x,n,y=None):
 		if n in x: return x[n]
 		else: return y
@@ -87,8 +132,17 @@ def get(x,n,y=None):
 	row(application,version)
 	row()
 
+	# contents
+	if options["contents"]:
+		hdr(2,"Table of Contents")
+		if options["modules"]: line(f"- {link('Modules')})")
+		if options["classes"]: line(f"- {link('Classes')})")
+		if options["objects"]: line(f"- {link('Objects')})")
+		if options["globals"]: line(f"- {link('Global Data')})")
+		line()
+
 	# list modules
-	if modules:
+	if modules and options["modules"]:
 		hdr(2,"Modules")
 		row("Name","Version")
 		row("----","-------")
@@ -99,94 +153,98 @@ def get(x,n,y=None):
 		row()
 
 	# classes
-	if objects:
-		active_classes = []
-		for object, properties in objects.items():
-			oclass = properties["class"]
+	if options["classes"]:
+		if objects:
+			active_classes = []
+			for object, properties in objects.items():
+				oclass = properties["class"]
+				if oclass not in active_classes:
+					active_classes.append(oclass)
+		else:
+			active_classes = classes.keys()
+		if active_classes:
+			hdr(2,"Classes")
+		for oclass, properties in classes.items():
 			if oclass not in active_classes:
-				active_classes.append(oclass)
-	else:
-		active_classes = classes.keys()
-	if active_classes:
-		hdr(2,"Classes")
-	for oclass, properties in classes.items():
-		if oclass not in active_classes:
-			continue
-		hdr(3,oclass)
-		row("Property","Type","Unit","Access","Flags","Keywords","Default","Description")
-		row("--------","----","----","------","-----","--------","-------","-----------")
-		for property, specs in properties.items():
-			if not type(specs) is dict:
 				continue
+			hdr(3,oclass)
+			row("Property","Type","Unit","Access","Flags","Keywords","Default","Description")
+			row("--------","----","----","------","-----","--------","-------","-----------")
+			for property, specs in properties.items():
+				if not type(specs) is dict:
+					continue
+				ptype = get(specs,"type","(na)")
+				access = get(specs,"access","PUBLIC")
+				flags = get(specs,"flags","")
+				keywords = get(specs,"keywords","")
+				unit = get(specs,"unit","")
+				if type(keywords) is dict:
+					keywords = " ".join(keywords.keys())
+				default = get(specs,"default","")
+				description = get(specs,"description","")
+				row(property,ptype,unit,access,flags,keywords,default,description)
+			row()
+
+	# objects
+	if options["objects"] and objects:
+		hdr(2,"Objects")
+		for name, properties in objects.items():
+			hdr(3,name)
+			row("Property","Value")
+			row("--------","-----")
+			for property, value in properties.items():
+				row(property,value)
+			row()			
+
+	if options["globals"]:
+		hdr(2,"Global data")
+
+		# header data
+		hdr(3,"Header data")
+		row("Name","Type","Access")
+		row("----","----","------")
+		for name, values in header.items():
+			row(name,values["type"],values["access"])
+		row()
+
+		# list system data types
+		hdr(3,"Data Types")
+		row("Type","Format","Default","Size","Converters","Comparators")
+		row("----","-------","-------","----","----------","-----------")
+		for ptype, values in types.items():
+			format = values["xsdtype"]
+			if "default" in values:
+				default = values["default"]
+			else:
+				default = "(na)"
+			if "strsize" in values:
+				size = values["strsize"]
+			else:
+				size = "(na)"
+			converters = []
+			for key, item in values.items():
+				if key[0:4] == "has_" and item: converters.append(key[4:])
+			converters = " ".join(converters)
+			comparators = " ".join(values["compareops"].keys())
+			row(ptype,format,default,size,converters,comparators)
+		row()
+
+		# globals
+		hdr(3,"Global variables")
+		row("Name","Module","Type","Access","Keywords","Value")
+		row("----","------","----","------","--------","-----")
+		for name, specs in globals.items():
+			if "::" in name:
+				name = name.split("::")
+				module = name[0]
+				name = name[1]
 			ptype = get(specs,"type","(na)")
-			access = get(specs,"access","PUBLIC")
-			flags = get(specs,"flags","")
+			access = get(specs,"access","(na)")
+			value = get(specs,"value","(na)")
 			keywords = get(specs,"keywords","")
-			unit = get(specs,"unit","")
 			if type(keywords) is dict:
 				keywords = " ".join(keywords.keys())
-			default = get(specs,"default","")
-			description = get(specs,"description","")
-			row(property,ptype,unit,access,flags,keywords,default,description)
+			else:
+				module = ""
+			row(name,module,ptype,access,keywords,value)
 		row()
-
-	# objects
-	for name, properties in objects.items():
-		hdr(3,name)
-		row("Property","Value")
-		row("--------","-----")
-		for property, value in properties.items():
-			row(property,value)
-		row()			
-
-	hdr(2,"Global data")
-
-	# header data
-	hdr(3,"Header data")
-	row("Name","Type","Access")
-	row("----","----","------")
-	for name, values in header.items():
-		row(name,values["type"],values["access"])
-	row()
-
-	# list system data types
-	hdr(3,"Data Types")
-	row("Type","Format","Default","Size","Converters","Comparators")
-	row("----","-------","-------","----","----------","-----------")
-	for ptype, values in types.items():
-		format = values["xsdtype"]
-		if "default" in values:
-			default = values["default"]
-		else:
-			default = "(na)"
-		if "strsize" in values:
-			size = values["strsize"]
-		else:
-			size = "(na)"
-		converters = []
-		for key, item in values.items():
-			if key[0:4] == "has_" and item: converters.append(key[4:])
-		converters = " ".join(converters)
-		comparators = " ".join(values["compareops"].keys())
-		row(ptype,format,default,size,converters,comparators)
-	row()
-
-	# globals
-	hdr(3,"Global variables")
-	row("Name","Module","Type","Access","Keywords","Value")
-	row("----","------","----","------","--------","-----")
-	for name, specs in globals.items():
-		if "::" in name:
-			name = name.split("::")
-			module = name[0]
-			name = name[1]
-		ptype = get(specs,"type","(na)")
-		access = get(specs,"access","(na)")
-		value = get(specs,"value","(na)")
-		keywords = get(specs,"keywords","")
-		if type(keywords) is dict:
-			keywords = " ".join(keywords.keys())
-		else:
-			module = ""
-		row(name,module,ptype,access,keywords,value)
-	row()