fix toc generation, recreate IDEA settings

vsch · vsch · commit 2c2106d812eb · 2016-07-02T23:00:30.000-04:00
diff --git a/README.md b/README.md
@@ -105,7 +105,7 @@ Progress
         - [x] Abbreviations
         - [x] Footnotes
         - [ ] Definitions
-        - [ ] Table of Contents
+        - [x] Table of Contents
     - Typographic
         - [ ] Quotes
         - [ ] Smarts
diff --git a/VERSION.md b/VERSION.md
@@ -1,6 +1,13 @@
 Version History
 ===============
 
+0.4.0
+-----
+
+- Add simulated table of contents option that will generate an AST, if converted back to
+  markdown, will result in a table of contents that will generate HTML with a table of contents
+  on parsers that interpret the table of contents element as a link reference.  
+
 0.3.2
 -----
 
diff --git a/flexmark-ext-abbreviation/flexmark-ext-abbreviation.iml b/flexmark-ext-abbreviation/flexmark-ext-abbreviation.iml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="false" type="FLEXMARK_JAVA_EXTENSION" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
@@ -16,4 +16,4 @@
     <orderEntry type="module" module-name="flexmark" />
     <orderEntry type="module" module-name="flexmark-test-util" scope="TEST" />
   </component>
-</module>
+</module>
diff --git a/flexmark-ext-autolink/flexmark-ext-autolink.iml b/flexmark-ext-autolink/flexmark-ext-autolink.iml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="false" type="FLEXMARK_JAVA_EXTENSION" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
@@ -17,4 +17,4 @@
     <orderEntry type="module" module-name="flexmark" />
     <orderEntry type="module" module-name="flexmark-test-util" scope="TEST" />
   </component>
-</module>
+</module>
diff --git a/flexmark-ext-emoji/flexmark-ext-emoji.iml b/flexmark-ext-emoji/flexmark-ext-emoji.iml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="false" type="FLEXMARK_JAVA_EXTENSION" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
@@ -16,4 +16,4 @@
     <orderEntry type="module" module-name="flexmark" />
     <orderEntry type="module" module-name="flexmark-test-util" scope="TEST" />
   </component>
-</module>
+</module>
diff --git a/flexmark-ext-footnotes/flexmark-ext-footnotes.iml b/flexmark-ext-footnotes/flexmark-ext-footnotes.iml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="false" type="FLEXMARK_JAVA_EXTENSION" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
@@ -16,4 +16,4 @@
     <orderEntry type="module" module-name="flexmark" />
     <orderEntry type="module" module-name="flexmark-test-util" scope="TEST" />
   </component>
-</module>
+</module>
diff --git a/flexmark-ext-gfm-strikethrough/flexmark-ext-gfm-strikethrough.iml b/flexmark-ext-gfm-strikethrough/flexmark-ext-gfm-strikethrough.iml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="false" type="FLEXMARK_JAVA_EXTENSION" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
@@ -16,4 +16,4 @@
     <orderEntry type="module" module-name="flexmark" />
     <orderEntry type="module" module-name="flexmark-test-util" scope="TEST" />
   </component>
-</module>
+</module>
diff --git a/flexmark-ext-gfm-tables/flexmark-ext-gfm-tables.iml b/flexmark-ext-gfm-tables/flexmark-ext-gfm-tables.iml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="false" type="FLEXMARK_JAVA_EXTENSION" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
@@ -16,4 +16,4 @@
     <orderEntry type="module" module-name="flexmark" />
     <orderEntry type="module" module-name="flexmark-test-util" scope="TEST" />
   </component>
-</module>
+</module>
diff --git a/flexmark-ext-gfm-tasklist/flexmark-ext-gfm-tasklist.iml b/flexmark-ext-gfm-tasklist/flexmark-ext-gfm-tasklist.iml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="FLEXMARK_JAVA_EXTENSION" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
@@ -14,4 +14,4 @@
     <orderEntry type="library" scope="TEST" name="junit-4.12" level="application" />
     <orderEntry type="library" scope="TEST" name="hamcrest-core-1.3" level="application" />
   </component>
-</module>
+</module>
diff --git a/flexmark-ext-tables/flexmark-ext-tables.iml b/flexmark-ext-tables/flexmark-ext-tables.iml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="false" type="FLEXMARK_JAVA_EXTENSION" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
@@ -16,4 +16,4 @@
     <orderEntry type="module" module-name="flexmark" />
     <orderEntry type="module" module-name="flexmark-test-util" scope="TEST" />
   </component>
-</module>
+</module>
diff --git a/flexmark-ext-toc/src/main/java/com/vladsch/flexmark/ext/toc/internal/TocNodeRenderer.java b/flexmark-ext-toc/src/main/java/com/vladsch/flexmark/ext/toc/internal/TocNodeRenderer.java
@@ -49,28 +49,33 @@ private void renderTocHeaders(NodeRendererContext context, HtmlWriter html, int
         int lastLevel = headings.get(0).getLevel();
 
         html.withAttr().line().tag("ul").indent();
+        boolean[] openedItems = new boolean[7];
 
         for (int i = 0; i < headings.size(); ++i) {
             Heading header = headings.get(i);
+            int headerLevel = header.getLevel();
 
             // ignore the level less than toc limit
-            if (header.getLevel() > level) {
+            if (headerLevel > level) {
                 continue;
             }
 
-            if (lastLevel < header.getLevel()) {
-                for (int lv = lastLevel; lv < header.getLevel(); ++lv) {
-                    html.withAttr().indent().tag("ul");
+            if (lastLevel < headerLevel) {
+                for (int lv = lastLevel; lv < headerLevel; ++lv) {
+                    html.withAttr().line().tag("ul").indent();
+                    openedItems[lv+1] = false;
                 }
-            } else if (lastLevel == header.getLevel()) {
+            } else if (lastLevel == headerLevel) {
                 if (i != 0) {
-                    html.line().tag("/li");
+                    html.tag("/li").line();
+                    openedItems[lastLevel] = false;
                 }
             } else {
                 html.tag("/li");
-                for (int lv = header.getLevel(); lv < lastLevel; ++lv) {
+                for (int lv = lastLevel; lv > headerLevel; lv--) {
                     html.unIndent().tag("/ul")
-                            .line().tag("/li");
+                            .tag("/li").line();
+                    openedItems[lv] = false;
                 }
             }
 
@@ -90,6 +95,7 @@ private void renderTocHeaders(NodeRendererContext context, HtmlWriter html, int
             }
 
             html.line().tag("li");
+            openedItems[headerLevel] = true;
             String headerId = context.getNodeId(header);
             if (headerId == null || context.isDoNotRenderLinks()) {
                 // just text
@@ -101,11 +107,12 @@ private void renderTocHeaders(NodeRendererContext context, HtmlWriter html, int
                 else html.text(headerText);
                 html.tag("/a");
             }
-            lastLevel = header.getLevel();
+            lastLevel = headerLevel;
         }
 
-        for (int i = initLevel - 1; i < lastLevel; ++i) {
-            html.tag("/li").unIndent().tag("/ul");
+        for (int i = lastLevel; i >= initLevel; i--) {
+            if (openedItems[i]) html.tag("/li");
+            html.unIndent().tag("/ul");
         }
         html.line();
     }
diff --git a/flexmark-ext-toc/src/test/resources/ext_toc_ast_spec.md b/flexmark-ext-toc/src/test/resources/ext_toc_ast_spec.md
@@ -117,26 +117,21 @@ Default rendering
 .
 <ul>
   <li><a href="#heading-1">Heading 1</a>
-    <ul>
+  <ul>
     <li><a href="#heading-11">Heading 1.1</a>
-      <ul>
-      <li><a href="#heading-111">Heading 1.1.1</a>
-      </li>
+    <ul>
+      <li><a href="#heading-111">Heading 1.1.1</a></li>
       <li><a href="#heading-112">Heading 1.1.2</a></li>
-    </ul>
-    </li>
-    <li><a href="#heading-12">Heading 1.2</a>
-    </li>
+    </ul></li>
+    <li><a href="#heading-12">Heading 1.2</a></li>
     <li><a href="#heading-13">Heading 1.3</a></li>
-  </ul>
-  </li>
+  </ul></li>
   <li><a href="#heading-2">Heading 2</a>
+  <ul>
     <ul>
-      <ul>
-      <li><a href="#heading-201">Heading 2.0.1</a>
-      </li>
+      <li><a href="#heading-201">Heading 2.0.1</a></li>
       <li><a href="#heading-202">Heading 2.0.2</a></li>
-    </ul></li>
+    </ul>
   </ul></li>
 </ul>
 <h1 id="heading-1">Heading 1</h1>
@@ -185,11 +180,10 @@ Default rendering with emphasis
 .
 <ul>
   <li><a href="#heading-some-bold-1">Heading <strong>some bold</strong> 1</a>
-    <ul>
+  <ul>
     <li><a href="#heading-11-some-italic">Heading 1.1 <em>some italic</em></a>
-      <ul>
-      <li><a href="#heading-111">Heading 1.1.1</a>
-      </li>
+    <ul>
+      <li><a href="#heading-111">Heading 1.1.1</a></li>
       <li><a href="#heading-112--some-bold-italic">Heading 1.1.2  <strong><em>some bold italic</em></strong></a></li>
     </ul></li>
   </ul></li>
@@ -241,21 +235,17 @@ Set levels rendering
 
 .
 <ul>
-  <li><a href="#heading-1">Heading 1</a>
-  </li>
+  <li><a href="#heading-1">Heading 1</a></li>
   <li><a href="#heading-2">Heading 2</a></li>
 </ul>
 <hr />
 <ul>
   <li><a href="#heading-1">Heading 1</a>
-    <ul>
-    <li><a href="#heading-11">Heading 1.1</a>
-    </li>
-    <li><a href="#heading-12">Heading 1.2</a>
-    </li>
+  <ul>
+    <li><a href="#heading-11">Heading 1.1</a></li>
+    <li><a href="#heading-12">Heading 1.2</a></li>
     <li><a href="#heading-13">Heading 1.3</a></li>
-  </ul>
-  </li>
+  </ul></li>
   <li><a href="#heading-2">Heading 2</a></li>
 </ul>
 <h1 id="heading-1">Heading 1</h1>
@@ -375,11 +365,10 @@ Text only rendering
 .
 <ul>
   <li><a href="#heading-some-bold-1">Heading some bold 1</a>
-    <ul>
+  <ul>
     <li><a href="#heading-11-some-italic">Heading 1.1 some italic</a>
-      <ul>
-      <li><a href="#heading-111">Heading 1.1.1</a>
-      </li>
+    <ul>
+      <li><a href="#heading-111">Heading 1.1.1</a></li>
       <li><a href="#heading-112--some-bold-italic">Heading 1.1.2  some bold italic</a></li>
     </ul></li>
   </ul></li>
diff --git a/flexmark-ext-wikilink/flexmark-ext-wikilink.iml b/flexmark-ext-wikilink/flexmark-ext-wikilink.iml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="false" type="FLEXMARK_JAVA_EXTENSION" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
@@ -16,4 +16,4 @@
     <orderEntry type="module" module-name="flexmark" />
     <orderEntry type="module" module-name="flexmark-test-util" scope="TEST" />
   </component>
-</module>
+</module>
diff --git a/flexmark-ext-yaml-front-matter/flexmark-ext-yaml-front-matter.iml b/flexmark-ext-yaml-front-matter/flexmark-ext-yaml-front-matter.iml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="false" type="FLEXMARK_JAVA_EXTENSION" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
@@ -15,4 +15,4 @@
     <orderEntry type="module" module-name="flexmark" />
     <orderEntry type="module" module-name="flexmark-test-util" scope="TEST" />
   </component>
-</module>
+</module>
diff --git a/flexmark-integration-test/flexmark-integration-test.iml b/flexmark-integration-test/flexmark-integration-test.iml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="false" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <exclude-output />
diff --git a/flexmark-java.iml b/flexmark-java.iml
@@ -5,7 +5,7 @@
       <configuration />
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
diff --git a/flexmark-test-suite/flexmark-test-suite.iml b/flexmark-test-suite/flexmark-test-suite.iml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
diff --git a/flexmark-test-util/flexmark-test-util.iml b/flexmark-test-util/flexmark-test-util.iml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="false" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">
@@ -14,4 +14,4 @@
     <orderEntry type="library" name="hamcrest-core-1.3" level="application" />
     <orderEntry type="module" module-name="flexmark" />
   </component>
-</module>
+</module>
diff --git a/flexmark/flexmark.iml b/flexmark/flexmark.iml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="false" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <exclude-output />
@@ -19,4 +19,4 @@
     <orderEntry type="library" scope="TEST" name="org.openjdk.jmh:jmh-generator-annprocess:1.12" level="project" />
     <orderEntry type="module" module-name="flexmark-test-util" scope="TEST" />
   </component>
-</module>
+</module>
