X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=src%2Fmain.c;h=49c0eebef26c89ac355929f1ee42ee747d007161;hb=c093b8dd5e29a2afb22988023d32261be1d41978;hp=37af9bc13b87a6041225d3074e3898af60f431e5;hpb=8689da8fc361118b05e33f3d19b269e9463040d0;p=smdp.git

diff --git a/src/main.c b/src/main.c
index 37af9bc..49c0eeb 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,6 +1,6 @@
 /*
  * mdp -- A command-line based markdown presentation tool.
- * Copyright (C) 2014 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
@@ -19,6 +19,7 @@
 
 #include <errno.h>
 #include <getopt.h>
+#include <locale.h> // setlocale
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -28,19 +29,20 @@
 void usage() {
     fprintf(stderr, "%s", "Usage: mdp [OPTION]... [FILE]\n");
     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", "  -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", "  -d, --debug       enable debug messages on STDERR\n");
+    fprintf(stderr, "%s", "                    add it multiple times to increases debug level\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", "  -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", "\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) 2014 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");
@@ -49,39 +51,45 @@ void version() {
 }
 
 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 #/#
 
     // 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' },
         { 0, 0, 0, 0 }
     };
 
     // parse command-line options
     int opt, debug = 0;
-    while ((opt = getopt_long(argc, argv, ":dfhitv", 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 ':': 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;
         }
     }
 
+    // set locale to that of the environment, so that ncurses properly renders
+    // 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;
@@ -124,7 +132,7 @@ int main(int argc, char *argv[]) {
 
         // load deck object from input
         deck_t *deck;
-        deck = markdown_load(input);
+        deck = markdown_load(input, noexpand);
 
         // close file
         fclose(input);
@@ -143,7 +151,7 @@ int main(int argc, char *argv[]) {
             markdown_debug(deck, debug);
         }
 
-        reload = ncurses_display(deck, notrans, nofade, invert, reload, noreload);
+        reload = ncurses_display(deck, reload, noreload, slidenum);
 
         free_deck(deck);