diff options
| author | ThunderMikey <mikecyj25@gmail.com> | 2018-03-21 21:09:29 +0000 |
|---|---|---|
| committer | ps-george <george.punter15@imperial.ac.uk> | 2018-03-21 21:09:29 +0000 |
| commit | 5c31ba3524c08b13150e7b9f325c7d1f55b6c847 (patch) | |
| tree | bc4d223260d6709e333e181fa785647e1cd6a4b8 /examples | |
| parent | 1b7622f7e87ebb1f4946e9b7cc3734fe9a41c42e (diff) | |
| download | FMark-5c31ba3524c08b13150e7b9f325c7d1f55b6c847.tar.gz FMark-5c31ba3524c08b13150e7b9f325c7d1f55b6c847.zip | |
Links and pics support in parser (#147)
* adding decimal place arg to table demo
* Updating examples
* replacing image test
* Update README for TOCite
* More changes in TOCite README
* add link and picture support
* Update README.md
* add link and pics tests
* Add js. Remove extraneous Open statement. Add html.
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/example.fmark | 61 | ||||
| -rw-r--r-- | examples/example.html | 123 | ||||
| -rw-r--r-- | examples/test.fmark | 4 | ||||
| -rw-r--r-- | examples/test1.fmark | 4 | ||||
| -rw-r--r-- | examples/test2.fmark | 3 | ||||
| -rw-r--r-- | examples/test_img.jpg | bin | 0 -> 49209 bytes |
6 files changed, 176 insertions, 19 deletions
diff --git a/examples/example.fmark b/examples/example.fmark index 6ffd3f6..5713234 100644 --- a/examples/example.fmark +++ b/examples/example.fmark @@ -19,8 +19,7 @@ {{ make_table(default;table;contents;{{10'}};{{11'}};{{12'}};{{20'}};{{21'}};{{22'}}) }} %} -<br> -{{ default_table(hi;my;name;is;geroge;hi) }} +{{ default_table(hi;my;name;is;FMark;hi) }} ## Including files @@ -31,7 +30,63 @@ |This|is|FMark| |---|---|---| |=5|=3|=SUM{[1,0]:[1,1]}| -|=5%3|=[1,0]*[1,1]/((7-4)+2)|=AVG{[1,0]:[1,2]}| +|=5%3|=[1,0]*[1,1]/((7-4)+2)|=AVG{[1,0]:[1,2]},2| + +## Standard Markdown + +### Styling + +*Emphasis* or _Emphasis_ + +**Bold** or __bold__ + +***Both*** or ___both___ + +Note: _underscores_ must have a space on either side. + +# Heading 1 + +## Heading 2 + +### Heading 3 + +#### Heading 4 + +##### Heading 5 + +##### Heading 6 + +### Lists + +Ordered List: + +1. First +2. Second + 1. Nested First + 2. Nested Second +3. Third + +Unordered List: + +* First +* Second + * Nested First + * Nested Second +* Third + +Unordered List 2: + +- First +- Second + - Nested First + - Nested Second +- Third + +### Links + +[Google](www.google.com) + + ## LateX maths $$2* \begin{pmatrix} diff --git a/examples/example.html b/examples/example.html index dfd3adc..bc766c9 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,11 +111,81 @@ <tr> <td>2</td> <td>3</td> - <td>5.33333333333333</td> + <td>5.33</td> </tr> </tbody> </table> - <h2 id="LateX_maths5">LateX maths</h2> + <h2 id="Standard_Markdown5">Standard Markdown</h2> + <h3 id="Styling6">Styling</h3> + <p> + <em>Emphasis</em> or + <em>Emphasis</em> + </p> + <p> + <strong>Bold</strong> or + <strong>bold</strong> + </p> + <p> + <em> + <strong>Both</strong> + </em> or + <em> + <strong>both</strong> + </em> + </p> + <p>Note: + <em>underscores</em> must have a space on either side.</p> + <h1 id="Heading_17">Heading 1</h1> + <h2 id="Heading_28">Heading 2</h2> + <h3 id="Heading_39">Heading 3</h3> + <h4 id="Heading_410">Heading 4</h4> + <h5 id="Heading_511">Heading 5</h5> + <h5 id="Heading_612">Heading 6</h5> + <h3 id="Lists13">Lists</h3> + <p>Ordered List:</p> + <ol> + <li>First</li> + <li>Second</li> + <ol> + <ol> + <li>Nested First</li> + <li>Nested Second</li> + </ol> + </ol> + <li>Third</li> + </ol> + <p>Unordered List:</p> + <ul> + <li>First</li> + <li>Second</li> + <ul> + <ul> + <li>Nested First</li> + <li>Nested Second</li> + </ul> + </ul> + <li>Third</li> + </ul> + <p>Unordered List 2:</p> + <ul> + <li>First</li> + <li>Second</li> + <ul> + <ul> + <li>Nested First</li> + <li>Nested Second</li> + </ul> + </ul> + <li>Third</li> + </ul> + <h3 id="Links14">Links</h3> + <p> + <a href="www.google.com">Google</a> + </p> + <p> + <img src="test_img.jpg" alt="image"> + </p> + <h2 id="LateX_maths15">LateX maths</h2> <p>$$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}$$</p> <script type="text/javascript" async src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/MathJax.js?config=TeX-MML-AM_CHTML"></script> diff --git a/examples/test.fmark b/examples/test.fmark index d130907..bb0d82d 100644 --- a/examples/test.fmark +++ b/examples/test.fmark @@ -1,3 +1,3 @@ -# Test! - +This is an included file! +<br> {{ include ./test1.fmark }}
\ No newline at end of file diff --git a/examples/test1.fmark b/examples/test1.fmark index 284ada5..3688808 100644 --- a/examples/test1.fmark +++ b/examples/test1.fmark @@ -1,3 +1 @@ -## Test1! - -{{ include ./test2.fmark }} +This is a second included file. diff --git a/examples/test2.fmark b/examples/test2.fmark deleted file mode 100644 index 8f7e3ec..0000000 --- a/examples/test2.fmark +++ /dev/null @@ -1,3 +0,0 @@ -{% macro test2Macro -This is defined in test2.fmark -%}
\ No newline at end of file diff --git a/examples/test_img.jpg b/examples/test_img.jpg Binary files differnew file mode 100644 index 0000000..8fd760f --- /dev/null +++ b/examples/test_img.jpg |
