merge htmlgen into readmes_examples

2 files changed, 29 insertions, 7 deletions

diff --git a/examples/example.fmark b/examples/example.fmark
index 47db26c..27d3861 100644
--- a/examples/example.fmark
+++ b/examples/example.fmark
@@ -1,3 +1,4 @@
+
 # FMark Example
 
 ## Table of contents
@@ -93,4 +94,30 @@ Unordered List 2:
 $$2* \begin{pmatrix} 
 x_{00} & x_{01} & x_{01} \newline 
 x_{10} & x_{11} & x_{11} \newline 
-x_{20} & x_{21} & x_{21} \end{pmatrix}$$
\ No newline at end of file
+x_{20} & x_{21} & x_{21} \end{pmatrix}$$
+
+## Footers
+
+%%RefStyle= Harvard
+
+### Simple footnote
+
+Here are some[^1] words, and more words[^2].
+
+[^2], A few lines to explain the words.
+      Another line to explain the words.
+
+[^1], We should probably sort them by ID numbers.
+
+### References
+
+All footnotes are collected and displayed at the end of the document[^Eric].
+The style of references are set at the top of the document.
+
+[^Eric], type= Book, author= Not Eric, year= 2018, title= An Introduction to FMark
+
+Note: Simple footnotes takes numerical IDs, and references need alphabetical IDs.
+
+# Other things
+
+Look the footers are rendered below this.
diff --git a/examples/example.html b/examples/example.html
index e08fb69..5b8d288 100644
--- a/examples/example.html
+++ b/examples/example.html
@@ -180,14 +180,9 @@
     </ul>
     <h3 id="Links14">Links</h3>
     <p>
-<<<<<<< HEAD
+
         <a href="http://www.google.com">Google</a>
         <!-- Images produce correct HTML but don't display in VS Code-->
-=======
-        <a href="www.google.com">Google</a>
-    </p>
-    <p>
->>>>>>> htmlgen
         <img src="test_img.jpg" alt="image">
     </p>
     <h2 id="LateX_maths15">LateX maths</h2>