From 96c3c465318c51c3a3ae7b2a460c228eb0ab7a14 Mon Sep 17 00:00:00 2001 From: Miguel Lechon Date: Thu, 18 Mar 2021 10:12:55 +0100 Subject: [PATCH] fopen with "wb" to avoid mixed LF/CRLF output on windows. --- samples/output_parse/output_parse.c | 2 +- .../example_site/generated/blog1.html | 185 +++++++++--------- .../example_site/generated/blog2.html | 88 ++++----- .../example_site/generated/blog_main.html | 136 ++++++------- .../example_site/generated/site.js | 120 ++++++------ .../example_site/generated/style.css | 12 +- .../static_site_generator.c | 6 +- 7 files changed, 272 insertions(+), 277 deletions(-) diff --git a/samples/output_parse/output_parse.c b/samples/output_parse/output_parse.c index c57888e..d4af3a7 100644 --- a/samples/output_parse/output_parse.c +++ b/samples/output_parse/output_parse.c @@ -73,7 +73,7 @@ int main(int argument_count, char **arguments) MD_String8 info_filename = MD_PushStringF("parsed_%.*s.txt", MD_StringExpand(code_filename)); printf("Parse Input -> Output: %.*s -> %.*s\n", MD_StringExpand(code_filename), MD_StringExpand(info_filename)); - FILE* file = fopen((char *)info_filename.str, "w"); + FILE* file = fopen((char *)info_filename.str, "wb"); for(MD_EachNode(node, root->first_child)) { PrintNode(node, file, 0); diff --git a/samples/static_site_generator/example_site/generated/blog1.html b/samples/static_site_generator/example_site/generated/blog1.html index 559ce50..ea7006b 100644 --- a/samples/static_site_generator/example_site/generated/blog1.html +++ b/samples/static_site_generator/example_site/generated/blog1.html @@ -1,94 +1,91 @@ - - - - - - - - - - - - - - - -Test Blog #1 | Example Site - - - -
-

Example Site

-Test Link 1 -Test Link 2 -Test Link 3 -
-
-
← Back

Test Blog #1

This is my test blog.

30 November 2020

Section 1

-

-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse ut ornare neque, vitae finibus leo. Praesent pulvinar, urna id lobortis iaculis, velit turpis luctus tortor, quis malesuada neque neque vitae turpis. Phasellus id molestie elit. Sed elementum ipsum a ligula semper, at varius augue rutrum. Pellentesque fringilla, orci nec fringilla finibus, turpis lacus vehicula elit, nec bibendum magna est quis massa. Aliquam efficitur facilisis nibh, ut sodales sapien scelerisque nec. Integer justo sem, pellentesque et ante imperdiet, interdum placerat sem. - -Nunc hendrerit lobortis commodo. Morbi felis quam, fermentum vitae libero vitae, fermentum sodales quam. Nulla bibendum tellus quis lorem sollicitudin pretium. Etiam commodo ex eget aliquet porta. In sit amet dui eleifend, mattis sem nec, tristique erat. Morbi malesuada fringilla bibendum. Integer odio ex, cursus a sodales quis, vehicula non dolor. - -Praesent vitae pharetra felis. Curabitur non ex non nunc pretium feugiat eu sit amet turpis. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean blandit ante leo. Vivamus iaculis mi vel sem tincidunt maximus. Aenean elementum ipsum non laoreet semper. Morbi non felis interdum lectus pulvinar mollis id non purus. Nullam eu ipsum ut turpis aliquam feugiat at non tellus. Suspendisse ornare erat quis enim ullamcorper, at rhoncus nulla suscipit. -

-
-

Section 2

-

-Aliquam quis diam at sem interdum imperdiet. Nunc imperdiet ligula tempus nibh semper mattis. Suspendisse fringilla molestie semper. Sed felis dolor, vehicula et tempus sed, porttitor finibus lacus. Pellentesque egestas ex finibus, facilisis tellus suscipit, accumsan turpis. Ut imperdiet vitae nisl eget vestibulum. Donec eu bibendum erat, id maximus magna. Vivamus quis rhoncus justo. Morbi eget commodo lorem, vulputate varius ipsum. Interdum et malesuada fames ac ante ipsum primis in faucibus. Integer accumsan, sem vel rutrum cursus, odio enim sodales leo, sit amet rutrum odio purus at nisi. Fusce iaculis ante id nunc volutpat tincidunt. Duis nec tincidunt ipsum. Fusce vitae odio ac velit sollicitudin maximus. Vestibulum ante dui, varius auctor ante eu, gravida laoreet justo. - -Vivamus dignissim mauris nec turpis convallis, vitae pellentesque sapien faucibus. Phasellus eu euismod elit, sit amet vehicula diam. Curabitur sit amet leo magna. In est erat, congue vel euismod id, venenatis vitae mauris. Vestibulum sit amet leo eget leo ornare feugiat. Interdum et malesuada fames ac ante ipsum primis in faucibus. Vivamus at efficitur ex, a mattis lorem. Maecenas blandit tincidunt tortor vel cursus. In in purus a nisi pretium venenatis in ut lacus. Maecenas venenatis rutrum laoreet. Donec aliquam leo vel risus cursus, placerat pretium lacus fringilla. Suspendisse ut porttitor mauris. -

- -

Section 3

- -

Section 4

-

-char *html_tag = "p";

-if(DD_NodeHasTag(node, DD_S8Lit("title")))

-{

-    html_tag = "h1";

-}

-else if(DD_NodeHasTag(node, DD_S8Lit("subtitle")))

-{

-    html_tag = "h2";

-}

-else if(DD_NodeHasTag(node, DD_S8Lit("code")))

-{

-    html_tag = "pre";

-}

-
-
- -
-

Example Site Footer

-Test Link 1 -Test Link 2 -Test Link 3 -
- - + + + + + + + + + + + + + + + +Test Blog #1 | Example Site + + + +
+

Example Site

+Test Link 1 +Test Link 2 +Test Link 3 +
+
+
← Back

Test Blog #1

This is my test blog.

30 November 2020

Section 1

+

+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse ut ornare neque, vitae finibus leo. Praesent pulvinar, urna id lobortis iaculis, velit turpis luctus tortor, quis malesuada neque neque vitae turpis. Phasellus id molestie elit. Sed elementum ipsum a ligula semper, at varius augue rutrum. Pellentesque fringilla, orci nec fringilla finibus, turpis lacus vehicula elit, nec bibendum magna est quis massa. Aliquam efficitur facilisis nibh, ut sodales sapien scelerisque nec. Integer justo sem, pellentesque et ante imperdiet, interdum placerat sem.

+

Nunc hendrerit lobortis commodo. Morbi felis quam, fermentum vitae libero vitae, fermentum sodales quam. Nulla bibendum tellus quis lorem sollicitudin pretium. Etiam commodo ex eget aliquet porta. In sit amet dui eleifend, mattis sem nec, tristique erat. Morbi malesuada fringilla bibendum. Integer odio ex, cursus a sodales quis, vehicula non dolor.

+

Praesent vitae pharetra felis. Curabitur non ex non nunc pretium feugiat eu sit amet turpis. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean blandit ante leo. Vivamus iaculis mi vel sem tincidunt maximus. Aenean elementum ipsum non laoreet semper. Morbi non felis interdum lectus pulvinar mollis id non purus. Nullam eu ipsum ut turpis aliquam feugiat at non tellus. Suspendisse ornare erat quis enim ullamcorper, at rhoncus nulla suscipit. +

+
+

Section 2

+

+Aliquam quis diam at sem interdum imperdiet. Nunc imperdiet ligula tempus nibh semper mattis. Suspendisse fringilla molestie semper. Sed felis dolor, vehicula et tempus sed, porttitor finibus lacus. Pellentesque egestas ex finibus, facilisis tellus suscipit, accumsan turpis. Ut imperdiet vitae nisl eget vestibulum. Donec eu bibendum erat, id maximus magna. Vivamus quis rhoncus justo. Morbi eget commodo lorem, vulputate varius ipsum. Interdum et malesuada fames ac ante ipsum primis in faucibus. Integer accumsan, sem vel rutrum cursus, odio enim sodales leo, sit amet rutrum odio purus at nisi. Fusce iaculis ante id nunc volutpat tincidunt. Duis nec tincidunt ipsum. Fusce vitae odio ac velit sollicitudin maximus. Vestibulum ante dui, varius auctor ante eu, gravida laoreet justo.

+

Vivamus dignissim mauris nec turpis convallis, vitae pellentesque sapien faucibus. Phasellus eu euismod elit, sit amet vehicula diam. Curabitur sit amet leo magna. In est erat, congue vel euismod id, venenatis vitae mauris. Vestibulum sit amet leo eget leo ornare feugiat. Interdum et malesuada fames ac ante ipsum primis in faucibus. Vivamus at efficitur ex, a mattis lorem. Maecenas blandit tincidunt tortor vel cursus. In in purus a nisi pretium venenatis in ut lacus. Maecenas venenatis rutrum laoreet. Donec aliquam leo vel risus cursus, placerat pretium lacus fringilla. Suspendisse ut porttitor mauris. +

+ +

Section 3

+ +

Section 4

+
+char *html_tag = "p";
+if(DD_NodeHasTag(node, DD_S8Lit("title")))
+{
+    html_tag = "h1";
+}
+else if(DD_NodeHasTag(node, DD_S8Lit("subtitle")))
+{
+    html_tag = "h2";
+}
+else if(DD_NodeHasTag(node, DD_S8Lit("code")))
+{
+    html_tag = "pre";
+}
+
+
+ +
+

Example Site Footer

+Test Link 1 +Test Link 2 +Test Link 3 +
+ + diff --git a/samples/static_site_generator/example_site/generated/blog2.html b/samples/static_site_generator/example_site/generated/blog2.html index 74fee8f..55a3c73 100644 --- a/samples/static_site_generator/example_site/generated/blog2.html +++ b/samples/static_site_generator/example_site/generated/blog2.html @@ -1,45 +1,43 @@ - - - - - - - - - - - - - - - -Hello, Again! | Example Site - - - -
-

Example Site

-Test Link 1 -Test Link 2 -Test Link 3 -
-
-
← Back

Hello, Again!

This is another test blog.

28 November 2020

Section 1

-

-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse ut ornare neque, vitae finibus leo. Praesent pulvinar, urna id lobortis iaculis, velit turpis luctus tortor, quis malesuada neque neque vitae turpis. Phasellus id molestie elit. Sed elementum ipsum a ligula semper, at varius augue rutrum. Pellentesque fringilla, orci nec fringilla finibus, turpis lacus vehicula elit, nec bibendum magna est quis massa. Aliquam efficitur facilisis nibh, ut sodales sapien scelerisque nec. Integer justo sem, pellentesque et ante imperdiet, interdum placerat sem. - -Nunc hendrerit lobortis commodo. Morbi felis quam, fermentum vitae libero vitae, fermentum sodales quam. Nulla bibendum tellus quis lorem sollicitudin pretium. Etiam commodo ex eget aliquet porta. In sit amet dui eleifend, mattis sem nec, tristique erat. Morbi malesuada fringilla bibendum. Integer odio ex, cursus a sodales quis, vehicula non dolor. - -Praesent vitae pharetra felis. Curabitur non ex non nunc pretium feugiat eu sit amet turpis. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean blandit ante leo. Vivamus iaculis mi vel sem tincidunt maximus. Aenean elementum ipsum non laoreet semper. Morbi non felis interdum lectus pulvinar mollis id non purus. Nullam eu ipsum ut turpis aliquam feugiat at non tellus. Suspendisse ornare erat quis enim ullamcorper, at rhoncus nulla suscipit. -

-
-
- -
-

Example Site Footer

-Test Link 1 -Test Link 2 -Test Link 3 -
- - + + + + + + + + + + + + + + + +Hello, Again! | Example Site + + + +
+

Example Site

+Test Link 1 +Test Link 2 +Test Link 3 +
+
+
← Back

Hello, Again!

This is another test blog.

28 November 2020

Section 1

+

+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Suspendisse ut ornare neque, vitae finibus leo. Praesent pulvinar, urna id lobortis iaculis, velit turpis luctus tortor, quis malesuada neque neque vitae turpis. Phasellus id molestie elit. Sed elementum ipsum a ligula semper, at varius augue rutrum. Pellentesque fringilla, orci nec fringilla finibus, turpis lacus vehicula elit, nec bibendum magna est quis massa. Aliquam efficitur facilisis nibh, ut sodales sapien scelerisque nec. Integer justo sem, pellentesque et ante imperdiet, interdum placerat sem.

+

Nunc hendrerit lobortis commodo. Morbi felis quam, fermentum vitae libero vitae, fermentum sodales quam. Nulla bibendum tellus quis lorem sollicitudin pretium. Etiam commodo ex eget aliquet porta. In sit amet dui eleifend, mattis sem nec, tristique erat. Morbi malesuada fringilla bibendum. Integer odio ex, cursus a sodales quis, vehicula non dolor.

+

Praesent vitae pharetra felis. Curabitur non ex non nunc pretium feugiat eu sit amet turpis. Orci varius natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Aenean blandit ante leo. Vivamus iaculis mi vel sem tincidunt maximus. Aenean elementum ipsum non laoreet semper. Morbi non felis interdum lectus pulvinar mollis id non purus. Nullam eu ipsum ut turpis aliquam feugiat at non tellus. Suspendisse ornare erat quis enim ullamcorper, at rhoncus nulla suscipit. +

+
+
+ +
+

Example Site Footer

+Test Link 1 +Test Link 2 +Test Link 3 +
+ + diff --git a/samples/static_site_generator/example_site/generated/blog_main.html b/samples/static_site_generator/example_site/generated/blog_main.html index 710894d..82e9b84 100644 --- a/samples/static_site_generator/example_site/generated/blog_main.html +++ b/samples/static_site_generator/example_site/generated/blog_main.html @@ -1,68 +1,68 @@ - - - - - - - - - - - - - - - -Blog | Example Site - - - -
-

Example Site

-Test Link 1 -Test Link 2 -Test Link 3 -
-
-

Blog

-
- -
-

Example Site Footer

-Test Link 1 -Test Link 2 -Test Link 3 -
- - + + + + + + + + + + + + + + + +Blog | Example Site + + + +
+

Example Site

+Test Link 1 +Test Link 2 +Test Link 3 +
+
+

Blog

+
+ +
+

Example Site Footer

+Test Link 1 +Test Link 2 +Test Link 3 +
+ + diff --git a/samples/static_site_generator/example_site/generated/site.js b/samples/static_site_generator/example_site/generated/site.js index 116a345..d38215e 100644 --- a/samples/static_site_generator/example_site/generated/site.js +++ b/samples/static_site_generator/example_site/generated/site.js @@ -1,61 +1,61 @@ -function StringFitsFilter(str, filter) -{ - let match = true; - let filter_upper = filter.toUpperCase(); - let filter_substrings = filter_upper.split(/[ _*]+/); - let str_upper = str.toUpperCase(); - let minimum_index = 0; - - for(let i = 0; i < filter_substrings.length; ++i) - { - if(filter_substrings[i].length > 0) - { - let index_of_substring = str_upper.indexOf(filter_substrings[i], minimum_index); - if(index_of_substring < 0 || index_of_substring < minimum_index) - { - match = false; - break; - } - minimum_index = index_of_substring + filter_substrings[i].length - 1; - } - } - - return match; -} - -function UpdateListByFilter(menu_id, filter_id) -{ - let ul = document.getElementById(menu_id); - let li = ul.getElementsByTagName("li"); - let input = document.getElementById(filter_id); - let filter = input.value.toUpperCase(); - for(let i = 0; i < li.length; i++) - { - if(filter.length > 0) - { - let a = li[i].getElementsByTagName("a")[0]; - if(StringFitsFilter(a.innerHTML, filter)) - { - li[i].style.display = ""; - } - else - { - li[i].style.display = "none"; - } - } - else - { - li[i].style.display = ""; - } - } -} - -function SearchInput(event, lister_idx) -{ - UpdateListByFilter("lister_"+lister_idx, "lister_search_"+lister_idx); -} - -function SearchKeyDown(event, lister_idx) -{ - UpdateListByFilter("lister_"+lister_idx, "lister_search_"+lister_idx); +function StringFitsFilter(str, filter) +{ + let match = true; + let filter_upper = filter.toUpperCase(); + let filter_substrings = filter_upper.split(/[ _*]+/); + let str_upper = str.toUpperCase(); + let minimum_index = 0; + + for(let i = 0; i < filter_substrings.length; ++i) + { + if(filter_substrings[i].length > 0) + { + let index_of_substring = str_upper.indexOf(filter_substrings[i], minimum_index); + if(index_of_substring < 0 || index_of_substring < minimum_index) + { + match = false; + break; + } + minimum_index = index_of_substring + filter_substrings[i].length - 1; + } + } + + return match; +} + +function UpdateListByFilter(menu_id, filter_id) +{ + let ul = document.getElementById(menu_id); + let li = ul.getElementsByTagName("li"); + let input = document.getElementById(filter_id); + let filter = input.value.toUpperCase(); + for(let i = 0; i < li.length; i++) + { + if(filter.length > 0) + { + let a = li[i].getElementsByTagName("a")[0]; + if(StringFitsFilter(a.innerHTML, filter)) + { + li[i].style.display = ""; + } + else + { + li[i].style.display = "none"; + } + } + else + { + li[i].style.display = ""; + } + } +} + +function SearchInput(event, lister_idx) +{ + UpdateListByFilter("lister_"+lister_idx, "lister_search_"+lister_idx); +} + +function SearchKeyDown(event, lister_idx) +{ + UpdateListByFilter("lister_"+lister_idx, "lister_search_"+lister_idx); } \ No newline at end of file diff --git a/samples/static_site_generator/example_site/generated/style.css b/samples/static_site_generator/example_site/generated/style.css index 9f1afc9..4200426 100644 --- a/samples/static_site_generator/example_site/generated/style.css +++ b/samples/static_site_generator/example_site/generated/style.css @@ -1,6 +1,6 @@ - -* -{ - padding: 0; - margins: 0; -} + +* +{ + padding: 0; + margins: 0; +} diff --git a/samples/static_site_generator/static_site_generator.c b/samples/static_site_generator/static_site_generator.c index 88f4f1b..6c57b80 100644 --- a/samples/static_site_generator/static_site_generator.c +++ b/samples/static_site_generator/static_site_generator.c @@ -102,7 +102,7 @@ int main(int argument_count, char **arguments) //~ NOTE(rjf): Generate stylesheet. if(site_info.style) { - FILE *file = fopen("style.css", "w"); + FILE *file = fopen("style.css", "wb"); if(file) { fprintf(file, "%.*s", MD_StringExpand(site_info.style->string)); @@ -112,7 +112,7 @@ int main(int argument_count, char **arguments) //~ NOTE(rjf): Generate JS. { - FILE *file = fopen("site.js", "w"); + FILE *file = fopen("site.js", "wb"); if(file) { fprintf(file, "%.*s", MD_StringExpand(js_string)); @@ -126,7 +126,7 @@ int main(int argument_count, char **arguments) PageInfo page_info = ParsePageInfo(root); MD_String8 name_without_extension = MD_SkipFolder(MD_ChopExtension(root->filename)); - FILE *file = fopen(MD_PushStringF("%.*s.html", MD_StringExpand(name_without_extension)).str, "w"); + FILE *file = fopen(MD_PushStringF("%.*s.html", MD_StringExpand(name_without_extension)).str, "wb"); if(file) { fprintf(file, "\n");