fletcher/MultiMarkdown-6
1
1
Fork 0
mirror of https://github.com/fletcher/MultiMarkdown-6.git synced 2024-10-04 10:37:08 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' of github.com:fletcher/MultiMarkdown-6 into develop

Browse Source
This commit is contained in:
Fletcher T. Penney 2017-03-20 11:31:09 -04:00
commit 4d3e0faf55
3 changed files with 38 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Sources/libMultiMarkdown/i18n.h
View File

@ -37,7 +37,7 @@
#include <stdlib.h>
#define kNumberOfLanguages 4
#define kNumberOfLanguages 6
#define kNumberOfStrings 4
#define kLanguage 0
@ -74,21 +74,29 @@ static const char * lc_lookup[kNumberOfLanguages * kNumberOfStrings] = {
"Regresar al texto", // Español
"Zum Haupttext", // Deutsch
"Retour au texte principal", // Français
"return to body", // Nederlands
"return to body", // Svenska
"see footnote", // English
"Ver nota a pie de página", // Español
"Siehe Fußnote", // Deutsch
"Voir note de bas de page", // Français
"see footnote", // Nederlands
"see footnote", // Svenska
"see citation", // English
"Ver referencia", // Español
"Siehe Zitat", // Deutsch
"Voir citation", // Français
"see citation", // Nederlands
"see citation", // Svenska
"see glossary", // English
"Ver glosario", // Español
"Siehe Glossar", // Deutsch
"Voir glossaire", // Français
"see glossary", // Nederlands
"see glossary", // Svenska
};
@ -130,6 +138,8 @@ enum lc_languages {
LC_ES, //!< Español
LC_DE, //!< Deutsch
LC_FR, //!< Français
LC_NL, //!< Nederlands
LC_SV, //!< Svenska
};
@ -141,6 +151,10 @@ static inline short i18n_language_from_string(const char * l) {
return LC_DE;
} else if (strcmp(l, "fr") == 0) {
return LC_FR;
} else if (strcmp(l, "nl") == 0) {
return LC_NL;
} else if (strcmp(l, "sv") == 0) {
return LC_SV;
}
return 0;

6
Sources/libMultiMarkdown/mmd.c
View File

@ -209,6 +209,12 @@ void mmd_engine_set_language(mmd_engine * e, short language) {
case LC_FR:
e->quotes_lang = FRENCH;
break;
case LC_NL:
e->quotes_lang = DUTCH;
break;
case LC_SV:
e->quotes_lang = SWEDISH;
break;
default:
e->quotes_lang = ENGLISH;
}

32
Sources/multimarkdown/main.c
View File

@ -81,7 +81,7 @@ struct arg_lit *a_help, *a_version, *a_compatibility, *a_nolabels, *a_batch,
struct arg_str *a_format, *a_lang;
struct arg_file *a_file, *a_o;
struct arg_end *a_end;
struct arg_rem *a_rem1, *a_rem2, *a_rem3, *a_rem4;
struct arg_rem *a_rem1, *a_rem2, *a_rem3, *a_rem4, *a_rem5;
DString * stdin_buffer() {
@ -146,29 +146,31 @@ int main(int argc, char** argv) {
a_rem1 = arg_rem("", ""),
a_batch = arg_lit0("b", "batch", "process each file separately"),
a_full = arg_lit0("f", "full", "force a complete document"),
a_snippet = arg_lit0("s", "snippet", "force a snippet"),
a_compatibility = arg_lit0("c", "compatibility", "Markdown compatibility mode"),
a_random = arg_lit0(NULL, "random", "use random numbers for footnote anchors"),
a_nolabels = arg_lit0(NULL, "nolabels", "Disable id attributes for headers"),
a_rem2 = arg_rem("", ""),
a_format = arg_str0("t", "to", "FORMAT", "convert to FORMAT, FORMAT = html|latex|beamer|memoir|mmd|odf|epub"),
a_o = arg_file0("o", "output", "FILE", "send output to FILE"),
a_batch = arg_lit0("b", "batch", "process each file separately"),
a_compatibility = arg_lit0("c", "compatibility", "Markdown compatibility mode"),
a_full = arg_lit0("f", "full", "force a complete document"),
a_snippet = arg_lit0("s", "snippet", "force a snippet"),
a_random = arg_lit0("", "random", "use random numbers for footnote anchors"),
a_rem2 = arg_rem("", ""),
a_rem3 = arg_rem("",""),
a_accept = arg_lit0("a", "accept", "accept all CriticMarkup changes"),
a_reject = arg_lit0("r", "reject", "reject all CriticMarkup changes"),
a_rem3 = arg_rem("", ""),
a_nolabels = arg_lit0(NULL, "nolabels", "Disable id attributes for headers"),
a_file = arg_filen(NULL, NULL, "<FILE>", 0, argc+2, "read input from file(s)"),
a_rem4 = arg_rem("", ""),
a_lang = arg_str0("l", "lang", "LANG", "language/smart quote localization, LANG = en|es|de|fr|nl|sv"),
a_rem5 = arg_rem("", ""),
a_file = arg_filen(NULL, NULL, "<FILE>", 0, argc+2, "read input from file(s) -- use stdin if no files given"),
a_end = arg_end(20),
};
@ -179,7 +181,7 @@ int main(int argc, char** argv) {
// '--help' takes precedence
if (a_help->count > 0) {
printf("\n%s v%s\n\n", MULTIMARKDOWN_NAME, MULTIMARKDOWN_VERSION);
printf("\n%s v%s -- %s\n\n", MULTIMARKDOWN_NAME, MULTIMARKDOWN_VERSION, MULTIMARKDOWN_COPYRIGHT);
printf("\tUsage: %s", binname);
arg_print_syntax(stdout, argtable, "\n\n");
printf("Options:\n");