/*
* mdp -- A command-line based markdown presentation tool.
- * Copyright (C) 2015 Michael Goehler
+ * Copyright (C) 2018 Michael Goehler
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
fprintf(stderr, "%s", "A command-line based markdown presentation tool.\n\n");
fprintf(stderr, "%s", " -d, --debug enable debug messages on STDERR\n");
fprintf(stderr, "%s", " add it multiple times to increases debug level\n");
- fprintf(stderr, "%s", " -f, --nofade disable color fading in 256 color mode\n");
+ fprintf(stderr, "%s", " -e, --expand enable character entity expansion\n");
fprintf(stderr, "%s", " -h, --help display this help and exit\n");
- fprintf(stderr, "%s", " -i, --invert swap black and white color\n");
- fprintf(stderr, "%s", " -t, --notrans disable transparency in transparent terminal\n");
fprintf(stderr, "%s", " -s, --noslidenum do not show slide number at the bottom\n");
fprintf(stderr, "%s", " -v, --version display the version number and license\n");
fprintf(stderr, "%s", " -x, --noslidemax show slide number, but not total number of slides\n");
+ fprintf(stderr, "%s", " -c, --nocodebg don't change the background color of code blocks\n");
fprintf(stderr, "%s", "\nWith no FILE, or when FILE is -, read standard input.\n\n");
exit(EXIT_FAILURE);
}
void version() {
printf("mdp %d.%d.%d\n", MDP_VER_MAJOR, MDP_VER_MINOR, MDP_VER_REVISION);
- printf("Copyright (C) 2015 Michael Goehler\n");
+ printf("Copyright (C) 2018 Michael Goehler\n");
printf("License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.\n");
printf("This is free software: you are free to change and redistribute it.\n");
printf("There is NO WARRANTY, to the extent permitted by law.\n");
}
int main(int argc, char *argv[]) {
- int notrans = 0; // disable transparency
- int nofade = 0; // disable fading
- int invert = 0; // invert color (black on white)
+ int noexpand = 1; // disable character entity expansion
int reload = 0; // reload page N (0 means no reload)
int noreload = 1; // reload disabled until we know input is a file
int slidenum = 2; // 0:don't show; 1:show #; 2:show #/#
+ int nocodebg = 0; // 0:show code bg as inverted; 1: don't invert code bg
// define command-line options
struct option longopts[] = {
- { "debug", no_argument, 0, 'd' },
- { "nofade", no_argument, 0, 'f' },
- { "help", no_argument, 0, 'h' },
- { "invert", no_argument, 0, 'i' },
- { "notrans", no_argument, 0, 't' },
- { "version", no_argument, 0, 'v' },
+ { "debug", no_argument, 0, 'd' },
+ { "expand", no_argument, 0, 'e' },
+ { "help", no_argument, 0, 'h' },
+ { "version", no_argument, 0, 'v' },
{ "noslidenum", no_argument, 0, 's' },
{ "noslidemax", no_argument, 0, 'x' },
+ { "nocodebg", no_argument, 0, 'c' },
{ 0, 0, 0, 0 }
};
// parse command-line options
int opt, debug = 0;
- while ((opt = getopt_long(argc, argv, ":dfhitvsx", longopts, NULL)) != -1) {
+ while ((opt = getopt_long(argc, argv, ":defhitvsxc", longopts, NULL)) != -1) {
switch(opt) {
- case 'd': debug += 1; break;
- case 'f': nofade = 1; break;
- case 'h': usage(); break;
- case 'i': invert = 1; break;
- case 't': notrans = 1; break;
- case 'v': version(); break;
+ case 'd': debug += 1; break;
+ case 'e': noexpand = 0; break;
+ case 'h': usage(); break;
+ case 'v': version(); break;
case 's': slidenum = 0; break;
case 'x': slidenum = 1; break;
+ case 'c': nocodebg = 1; break;
case ':': fprintf(stderr, "%s: '%c' requires an argument\n", argv[0], optopt); usage(); break;
case '?':
default : fprintf(stderr, "%s: option '%c' is invalid\n", argv[0], optopt); usage(); break;
// UTF-8 characters if the system supports it
setlocale(LC_CTYPE, "");
+ // setup list string
+ setup_list_strings();
+
// open file or set input to STDIN
char *file = NULL;
FILE *input;
// load deck object from input
deck_t *deck;
- deck = markdown_load(input);
+ deck = markdown_load(input, noexpand);
// close file
fclose(input);
markdown_debug(deck, debug);
}
- reload = ncurses_display(deck, notrans, nofade, invert, reload, noreload, slidenum);
+ reload = ncurses_display(deck, reload, noreload, slidenum, nocodebg);
free_deck(deck);