Skip to content

Commit

Permalink
Annotation of document with comments.
Browse files Browse the repository at this point in the history
  • Loading branch information
@hallambaker
hallambaker committed Oct 17, 2024
1 parent 9a712a6 commit 4defa65
Show file tree
Hide file tree
Showing 93 changed files with 2,140 additions and 381 deletions.
1 change: 0 additions & 1 deletion ASN/asn2/VS.Make
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ postbuildRecurse :

# Non shared project, nothing to do
prebuild : prebuildRecurse $(ToolTargets)
version version.version AssemblyVersion.cs


postbuild : postbuildRecurse
Expand Down
39 changes: 39 additions & 0 deletions BuildTools.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Goedel.Protocol", "..\mmm\L
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Goedel.Guigen", "..\mmm\Libraries\Goedel.Guigen\Goedel.Guigen.csproj", "{67294999-E531-4E29-8B78-2CDF8925DB14}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "annotate", "DocTools\annotate\annotate.csproj", "{5920C595-4CB0-4F92-A6B1-ADA0D7212AC4}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -2061,6 +2063,42 @@ Global
{67294999-E531-4E29-8B78-2CDF8925DB14}.Yaschema|Any CPU.Build.0 = Debug|Any CPU
{67294999-E531-4E29-8B78-2CDF8925DB14}.Yaschema|x86.ActiveCfg = Debug|Any CPU
{67294999-E531-4E29-8B78-2CDF8925DB14}.Yaschema|x86.Build.0 = Debug|Any CPU
{5920C595-4CB0-4F92-A6B1-ADA0D7212AC4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5920C595-4CB0-4F92-A6B1-ADA0D7212AC4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5920C595-4CB0-4F92-A6B1-ADA0D7212AC4}.Debug|x86.ActiveCfg = Debug|Any CPU
{5920C595-4CB0-4F92-A6B1-ADA0D7212AC4}.Debug|x86.Build.0 = Debug|Any CPU
{5920C595-4CB0-4F92-A6B1-ADA0D7212AC4}.DotNet|Any CPU.ActiveCfg = Debug|Any CPU
{5920C595-4CB0-4F92-A6B1-ADA0D7212AC4}.DotNet|Any CPU.Build.0 = Debug|Any CPU
{5920C595-4CB0-4F92-A6B1-ADA0D7212AC4}.DotNet|x86.ActiveCfg = Debug|Any CPU
{5920C595-4CB0-4F92-A6B1-ADA0D7212AC4}.DotNet|x86.Build.0 = Debug|Any CPU
{5920C595-4CB0-4F92-A6B1-ADA0D7212AC4}.Focus|Any CPU.ActiveCfg = Debug|Any CPU
{5920C595-4CB0-4F92-A6B1-ADA0D7212AC4}.Focus|Any CPU.Build.0 = Debug|Any CPU
{5920C595-4CB0-4F92-A6B1-ADA0D7212AC4}.Focus|x86.ActiveCfg = Debug|Any CPU
{5920C595-4CB0-4F92-A6B1-ADA0D7212AC4}.Focus|x86.Build.0 = Debug|Any CPU
{5920C595-4CB0-4F92-A6B1-ADA0D7212AC4}.Github|Any CPU.ActiveCfg = Github|Any CPU
{5920C595-4CB0-4F92-A6B1-ADA0D7212AC4}.Github|Any CPU.Build.0 = Github|Any CPU
{5920C595-4CB0-4F92-A6B1-ADA0D7212AC4}.Github|x86.ActiveCfg = Github|Any CPU
{5920C595-4CB0-4F92-A6B1-ADA0D7212AC4}.Github|x86.Build.0 = Github|Any CPU
{5920C595-4CB0-4F92-A6B1-ADA0D7212AC4}.Publish|Any CPU.ActiveCfg = Debug|Any CPU
{5920C595-4CB0-4F92-A6B1-ADA0D7212AC4}.Publish|Any CPU.Build.0 = Debug|Any CPU
{5920C595-4CB0-4F92-A6B1-ADA0D7212AC4}.Publish|x86.ActiveCfg = Debug|Any CPU
{5920C595-4CB0-4F92-A6B1-ADA0D7212AC4}.Publish|x86.Build.0 = Debug|Any CPU
{5920C595-4CB0-4F92-A6B1-ADA0D7212AC4}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5920C595-4CB0-4F92-A6B1-ADA0D7212AC4}.Release|Any CPU.Build.0 = Release|Any CPU
{5920C595-4CB0-4F92-A6B1-ADA0D7212AC4}.Release|x86.ActiveCfg = Release|Any CPU
{5920C595-4CB0-4F92-A6B1-ADA0D7212AC4}.Release|x86.Build.0 = Release|Any CPU
{5920C595-4CB0-4F92-A6B1-ADA0D7212AC4}.Sandcastle|Any CPU.ActiveCfg = Sandcastle|Any CPU
{5920C595-4CB0-4F92-A6B1-ADA0D7212AC4}.Sandcastle|Any CPU.Build.0 = Sandcastle|Any CPU
{5920C595-4CB0-4F92-A6B1-ADA0D7212AC4}.Sandcastle|x86.ActiveCfg = Sandcastle|Any CPU
{5920C595-4CB0-4F92-A6B1-ADA0D7212AC4}.Sandcastle|x86.Build.0 = Sandcastle|Any CPU
{5920C595-4CB0-4F92-A6B1-ADA0D7212AC4}.Windows|Any CPU.ActiveCfg = Debug|Any CPU
{5920C595-4CB0-4F92-A6B1-ADA0D7212AC4}.Windows|Any CPU.Build.0 = Debug|Any CPU
{5920C595-4CB0-4F92-A6B1-ADA0D7212AC4}.Windows|x86.ActiveCfg = Debug|Any CPU
{5920C595-4CB0-4F92-A6B1-ADA0D7212AC4}.Windows|x86.Build.0 = Debug|Any CPU
{5920C595-4CB0-4F92-A6B1-ADA0D7212AC4}.Yaschema|Any CPU.ActiveCfg = Debug|Any CPU
{5920C595-4CB0-4F92-A6B1-ADA0D7212AC4}.Yaschema|Any CPU.Build.0 = Debug|Any CPU
{5920C595-4CB0-4F92-A6B1-ADA0D7212AC4}.Yaschema|x86.ActiveCfg = Debug|Any CPU
{5920C595-4CB0-4F92-A6B1-ADA0D7212AC4}.Yaschema|x86.Build.0 = Debug|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down Expand Up @@ -2135,6 +2173,7 @@ Global
{3798E12C-FA99-4BCD-8946-856AD2C6E34A} = {C7832AC9-CFEB-42A5-86C9-328DD37B67F6}
{EBF73758-0049-4BE9-B587-C2CF6BFBB235} = {510C00FB-FB4F-4C9E-A2F6-86D2FA171CD1}
{67294999-E531-4E29-8B78-2CDF8925DB14} = {510C00FB-FB4F-4C9E-A2F6-86D2FA171CD1}
{5920C595-4CB0-4F92-A6B1-ADA0D7212AC4} = {9E6E38F6-13C4-49A0-A278-018742486965}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {4B0FED20-F156-4724-9241-1F63A97DA43E}
Expand Down
1 change: 0 additions & 1 deletion Command/CommandEcho/VS.Make
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ postbuildRecurse :

# Non shared project, nothing to do
prebuild : prebuildRecurse $(ToolTargets)
version version.version AssemblyVersion.cs


postbuild : postbuildRecurse
Expand Down
1 change: 0 additions & 1 deletion Command/commandparse/VS.Make
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ postbuildRecurse :

# Non shared project, nothing to do
prebuild : prebuildRecurse $(ToolTargets)
version version.version AssemblyVersion.cs


postbuild : postbuildRecurse
Expand Down
1 change: 0 additions & 1 deletion DNSConfig/srvconf/VS.Make
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ postbuildRecurse :

# Non shared project, nothing to do
prebuild : prebuildRecurse $(ToolTargets)
version version.version AssemblyVersion.cs


postbuild : postbuildRecurse
Expand Down
4 changes: 2 additions & 2 deletions DocTools/Goedel.Document.Markdown/AssemblyVersion.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// These values are automatically generated from version.version
[assembly: System.Reflection.AssemblyVersionAttribute("0.0.0.122")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("0.0.0.122")]
[assembly: System.Reflection.AssemblyVersionAttribute("0.0.0.184")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("0.0.0.184")]

2 changes: 1 addition & 1 deletion DocTools/Goedel.Document.Markdown/BlockParse.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
namespace Goedel.Document.Markdown;

public abstract class BlockParser {
public Document Document;
public MarkdownDocument Document;
public TagCatalog TagCatalog;
protected CatalogEntry CurrentCatalogEntry = null;
protected List<TagValue> CurrentAttributes = null;
Expand Down
22 changes: 11 additions & 11 deletions DocTools/Goedel.Document.Markdown/Document.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public class DocumentSet {
public DocumentSet Root;
public DocumentSet Parent;

public List<Document> Documents = new();
public List<MarkdownDocument> Documents = new();
public List<DocumentSet> Directories = new();

public List<Resource> Resources = new();
Expand Down Expand Up @@ -57,7 +57,7 @@ public void AddDirectory(DocumentSet Parent, DirectoryInfo DirectoryInfo, string
string Extension = Path.GetExtension(FileInfo.Name).ToLower();

if (Extension == ".md") {
var Document = new Document(this, FileInfo, TagCatalog);
var Document = new MarkdownDocument(this, FileInfo, TagCatalog);

if (Document.IsIndex & (Document.ShortTitle != null)) {
Name = Document.ShortTitle;
Expand All @@ -67,7 +67,7 @@ public void AddDirectory(DocumentSet Parent, DirectoryInfo DirectoryInfo, string

else {
//Only processing Markdown right now.
Document Document = null;
MarkdownDocument Document = null;

if (TagCatalog.DocumentProcess != null) {
Document = TagCatalog.DocumentProcess(this, FileInfo, TagCatalog);
Expand Down Expand Up @@ -417,7 +417,7 @@ public Paragraph() {
/// <summary>
/// A Document Resource.
/// </summary>
public partial class Document : Resource {
public partial class MarkdownDocument : Resource {

public Dictionary<string, List<Meta>> MetaData = new();
public List<Heading> Headings;
Expand All @@ -434,36 +434,36 @@ public partial class Document : Resource {
public bool IsIndex = false;


public Document() {
public MarkdownDocument() {
}

public Document(string file) {
public MarkdownDocument(string file) {
Name = file;
Link = System.IO.Path.GetFileNameWithoutExtension(Name) + ".html";

using var Reader = new LexReader(file.OpenTextReader());
Parse(Reader);
}

public Document(FileInfo FileInfo) :
public MarkdownDocument(FileInfo FileInfo) :
base(FileInfo) {
}

public Document(DocumentSet Parent, FileInfo FileInfo) :
public MarkdownDocument(DocumentSet Parent, FileInfo FileInfo) :
base(Parent, FileInfo) {
}


public Document(FileInfo FileInfo, TagCatalog TagCatalog) :
public MarkdownDocument(FileInfo FileInfo, TagCatalog TagCatalog) :
base(FileInfo) => Init(FileInfo, TagCatalog);

public Document(Stream Stream, TagCatalog TagCatalog)
public MarkdownDocument(Stream Stream, TagCatalog TagCatalog)
: base() {
using var Reader = new LexReader(Stream);
Init(Reader, TagCatalog);
}

public Document(DocumentSet Parent, FileInfo FileInfo, TagCatalog TagCatalog) :
public MarkdownDocument(DocumentSet Parent, FileInfo FileInfo, TagCatalog TagCatalog) :
base (Parent, FileInfo) {

Link = System.IO.Path.GetFileNameWithoutExtension(Name) + ".html";
Expand Down
4 changes: 2 additions & 2 deletions DocTools/Goedel.Document.Markdown/MakeWeb.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ public void MakeFiles (DocumentSet DocumentSet, string RootPath) {
}
}

public void MakeHTML(Document Document, string TargetDir) {
public void MakeHTML(MarkdownDocument Document, string TargetDir) {
string TargetFile = TargetDir + @"\" + Document.Link;

Console.WriteLine("Make file in {0}", TargetFile);
Expand Down Expand Up @@ -411,7 +411,7 @@ void WriteText(HTMLWriter HTMLWriter, Block Block) {
public string[] NavEntryActive = {};
public string[] NavEntryEnd = {};

public void MakeNav (HTMLWriter HTMLWriter, Document Document) {
public void MakeNav (HTMLWriter HTMLWriter, MarkdownDocument Document) {

Console.WriteLine();
Console.WriteLine("Make Navigator {0}", Document.Name);
Expand Down
2 changes: 1 addition & 1 deletion DocTools/Goedel.Document.Markdown/MarkDown.cs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

// This file was automatically generated at 10/14/2024 3:46:45 PM
// This file was automatically generated at 10/17/2024 5:27:43 PM
//
// Changes to this file may be overwritten without warning
//
Expand Down
2 changes: 1 addition & 1 deletion DocTools/Goedel.Document.Markdown/MarkParagraph.cs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

// This file was automatically generated at 10/14/2024 3:46:45 PM
// This file was automatically generated at 10/17/2024 5:27:43 PM
//
// Changes to this file may be overwritten without warning
//
Expand Down
2 changes: 1 addition & 1 deletion DocTools/Goedel.Document.Markdown/MarkWordParagraph.cs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

// This file was automatically generated at 10/14/2024 3:46:45 PM
// This file was automatically generated at 10/17/2024 5:27:43 PM
//
// Changes to this file may be overwritten without warning
//
Expand Down
10 changes: 5 additions & 5 deletions DocTools/Goedel.Document.Markdown/NewBlockParse.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public static void Register() {
/// <param name="FileName"></param>
/// <param name="TagCatalog"></param>
/// <returns></returns>
public static Document Parse(string FileName, TagCatalog TagCatalog) {
public static MarkdownDocument Parse(string FileName, TagCatalog TagCatalog) {
var TextReader = new StreamReader(FileName);
return Parse(TextReader, TagCatalog);
}
Expand All @@ -44,10 +44,10 @@ public static Document Parse(string FileName, TagCatalog TagCatalog) {
/// <param name="TextReader"></param>
/// <param name="TagCatalog"></param>
/// <returns></returns>
public static Document Parse(TextReader TextReader, TagCatalog TagCatalog) {
public static MarkdownDocument Parse(TextReader TextReader, TagCatalog TagCatalog) {

var Reader = new LexReader(TextReader);
var Document = new Document();
var Document = new MarkdownDocument();

Document.Parse(Reader);
var BlockParser = new BlockParserMarkDown() {
Expand All @@ -68,7 +68,7 @@ public static Document Parse(TextReader TextReader, TagCatalog TagCatalog) {
/// <param name="Document"></param>
/// <returns></returns>
public static bool Include(string FileName, TagCatalog TagCatalog,
Document Document) {
MarkdownDocument Document) {
CatalogEntry CatalogEntryTable = TagCatalog.Find("table");
CatalogEntry CatalogEntryTableRow = TagCatalog.Find("tablerow");
CatalogEntry CatalogEntryTableCell = TagCatalog.Find("tablecell");
Expand All @@ -81,7 +81,7 @@ public static bool Include(string FileName, TagCatalog TagCatalog,

var Reader = new LexReader(FilePath.OpenTextReader());

var Included = new Document();
var Included = new MarkdownDocument();
Included.Parse(Reader);

var BlockParser = new BlockParserMarkDown() {
Expand Down
2 changes: 1 addition & 1 deletion DocTools/Goedel.Document.Markdown/Parse.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

namespace Goedel.Document.Markdown {

public partial class Document {
public partial class MarkdownDocument {

public void Parse(LexReader Reader) => Parse(Reader, Paragraphs);

Expand Down
8 changes: 4 additions & 4 deletions DocTools/Goedel.Document.Markdown/ParseRegistry.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

namespace Goedel.Document.Markdown {

public delegate Document ParseDelegate(string FileName, TagCatalog TagCatalog);
public delegate bool IncludeDelegate(string FileName, TagCatalog TagCatalog, Document Document);
public delegate MarkdownDocument ParseDelegate(string FileName, TagCatalog TagCatalog);
public delegate bool IncludeDelegate(string FileName, TagCatalog TagCatalog, MarkdownDocument Document);


public class ParseRegistryEntry {
Expand All @@ -32,7 +32,7 @@ static ParseRegistryEntry GetEntry (string FileName) {
}


public static bool Include (string FileName, TagCatalog TagCatalog, Document Document) {
public static bool Include (string FileName, TagCatalog TagCatalog, MarkdownDocument Document) {
var Entry = GetEntry(FileName);
if (Entry == null) {
return false;
Expand All @@ -43,7 +43,7 @@ public static bool Include (string FileName, TagCatalog TagCatalog, Document Doc
return true;
}

public static Document Parse(string FileName, TagCatalog TagCatalog) {
public static MarkdownDocument Parse(string FileName, TagCatalog TagCatalog) {
var Entry = GetEntry(FileName);
if (Entry == null) {
return null;
Expand Down
2 changes: 1 addition & 1 deletion DocTools/Goedel.Document.Markdown/TagCatalog.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ public string Init(Dictionary<string, CatalogEntry> Dictionary,

public class TagCatalog {

public delegate Document DocumentProcessDelegate(DocumentSet Parent,
public delegate MarkdownDocument DocumentProcessDelegate(DocumentSet Parent,
FileInfo FileInfo, TagCatalog TagCatalog);
public delegate void ProcessDelegate(string InPath, string OutPath);

Expand Down
4 changes: 2 additions & 2 deletions DocTools/Goedel.Document.Markdown/version.version
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
0.0.0.122
0.0.0.122
0.0.0.184
0.0.0.184
4 changes: 2 additions & 2 deletions DocTools/Goedel.Document.OpenXML/AssemblyVersion.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// These values are automatically generated from version.version
[assembly: System.Reflection.AssemblyVersionAttribute("0.0.0.122")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("0.0.0.122")]
[assembly: System.Reflection.AssemblyVersionAttribute("0.0.0.184")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("0.0.0.184")]

6 changes: 3 additions & 3 deletions DocTools/Goedel.Document.OpenXML/MakeWord.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public partial class MakeWord : HT.MakeFormat {
const string StyleID_li = "li";
const string StyleID_ni = "ni";

Goedel.Document.RFC.Document Source;
Goedel.Document.RFC.BlockDocument Source;

private void DumpNumber (StyleParagraphProperties st1) {
if (st1 == null) {
Expand All @@ -53,7 +53,7 @@ private void DumpNumber (StyleParagraphProperties st1) {



private MakeWord (string Filename, Goedel.Document.RFC.Document Source) {
private MakeWord (string Filename, Goedel.Document.RFC.BlockDocument Source) {
this.Source = Source;

//ReadTest();
Expand All @@ -65,7 +65,7 @@ private MakeWord (string Filename, Goedel.Document.RFC.Document Source) {
Generate();
}

public static MakeWord FromHTML2RFC(string Filename, Goedel.Document.RFC.Document Source) => new(Filename, Source);
public static MakeWord FromHTML2RFC(string Filename, Goedel.Document.RFC.BlockDocument Source) => new(Filename, Source);


private void Generate () {
Expand Down
6 changes: 3 additions & 3 deletions DocTools/Goedel.Document.OpenXML/OpenWordDocument.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

namespace Goedel.Document.OpenXML {

class OpenWordDocument : Goedel.Document.Markdown.Document {
class OpenWordDocument : Goedel.Document.Markdown.MarkdownDocument {

/// <summary>
/// Construct a reader for a complete file.
Expand All @@ -25,7 +25,7 @@ public OpenWordDocument(FileInfo FileInfo, TagCatalog TagCatalog) :
/// <param name="TagCatalog"></param>
/// <param name="Document"></param>
public OpenWordDocument(string FileName, TagCatalog TagCatalog,
Goedel.Document.Markdown.Document Document) => Parse(FileName, TagCatalog, Document);
Goedel.Document.Markdown.MarkdownDocument Document) => Parse(FileName, TagCatalog, Document);


/// <summary>
Expand All @@ -36,7 +36,7 @@ public OpenWordDocument(string FileName, TagCatalog TagCatalog,
/// <param name="TagCatalog"></param>
/// <param name="Document"></param>
public static void Parse (string FileName, TagCatalog TagCatalog,
Goedel.Document.Markdown.Document Document) {
Goedel.Document.Markdown.MarkdownDocument Document) {



Expand Down
Loading

0 comments on commit 4defa65

Please sign in to comment.