aboutsummaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorps-george <punter.s.g@gmail.com>2018-03-21 22:13:10 +0000
committerps-george <punter.s.g@gmail.com>2018-03-21 22:13:10 +0000
commit10a811662bf0f14e9a88ae9ae571236fdba9c8cd (patch)
tree8c06d0e6307e21b7b72b0b0a791067674e5462d8 /examples
parentd0aa396afe4928910ba2fc8ad498be8548b32459 (diff)
parent5c31ba3524c08b13150e7b9f325c7d1f55b6c847 (diff)
downloadFMark-10a811662bf0f14e9a88ae9ae571236fdba9c8cd.tar.gz
FMark-10a811662bf0f14e9a88ae9ae571236fdba9c8cd.zip
merging htmlgen
Diffstat (limited to 'examples')
-rw-r--r--examples/example.html57
1 files changed, 50 insertions, 7 deletions
diff --git a/examples/example.html b/examples/example.html
index 38e6b0e..e08fb69 100644
--- a/examples/example.html
+++ b/examples/example.html
@@ -2,7 +2,7 @@
<head>
<meta name="viewport" content="width=device-width">
- <title></title>
+ <title>/Users/g2/Documents/EIE3/FMark-vscode/src/Fmark/examples/</title>
</head>
<body>
@@ -26,14 +26,49 @@
<a href="#Spreadsheet_functionality4">Spreadsheet functionality</a>
</li>
<li>
- <a href="#LateX_maths5">LateX maths</a>
+ <a href="#Standard_Markdown5">Standard Markdown</a>
+ </li>
+ <ol>
+ <li>
+ <a href="#Styling6">Styling</a>
+ </li>
+ </ol>
+ </ol>
+ <li>
+ <a href="#Heading_17">Heading 1</a>
+ </li>
+ <li>
+ <a href="#Heading_28">Heading 2</a>
+ </li>
+ <ol>
+ <li>
+ <a href="#Heading_39">Heading 3</a>
+ </li>
+ </ol>
+ <ol>
+ <li>
+ <a href="#Heading_410">Heading 4</a>
+ </li>
+ </ol>
+ <ol>
+ <li>
+ <a href="#Heading_511">Heading 5</a>
</li>
</ol>
+ <li>
+ <a href="#Heading_612">Heading 6</a>
+ </li>
+ <li>
+ <a href="#Lists13">Lists</a>
+ </li>
+ <li>
+ <a href="#Links14">Links</a>
+ </li>
+ <li>
+ <a href="#LateX_maths15">LateX maths</a>
+ </li>
</ol>
<h2 id="Macros2">Macros</h2>
- <p>
- <br>
- </p>
<table>
<thead>
<tr>
@@ -50,12 +85,14 @@
</tr>
<tr>
<td>is</td>
- <td>geroge</td>
+ <td>FMark</td>
<td>hi</td>
</tr>
</tbody>
</table>
<h2 id="Including_files3">Including files</h2>
+ <p>This is an included file!
+ <br> This is a second included file.</p>
<h2 id="Spreadsheet_functionality4">Spreadsheet functionality</h2>
<table>
<thead>
@@ -74,7 +111,7 @@
<tr>
<td>2</td>
<td>3</td>
- <td>5.33333333333333</td>
+ <td>5.33</td>
</tr>
</tbody>
</table>
@@ -143,8 +180,14 @@
</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>