fix org2gemini

This commit is contained in:
Yann Esposito (Yogsototh) 2021-05-02 11:17:38 +02:00
parent 492ef0f32b
commit d168d0b28e
Signed by untrusted user who does not match committer: yogsototh
GPG key ID: 7B19A4C650D59646
4 changed files with 13 additions and 8 deletions

View file

@ -7,7 +7,8 @@
all: allatend
SRC_DIR ?= src
DST_DIR ?= _site
SRC_RAW_FILES := $(shell find $(SRC_DIR) -type f)
NO_DRAFT := -not -path '$(SRC_DIR)/drafts/*'
SRC_RAW_FILES := $(shell find $(SRC_DIR) -type f $(NO_DRAFT))
DST_RAW_FILES := $(patsubst $(SRC_DIR)/%,$(DST_DIR)/%,$(SRC_RAW_FILES))
ALL += $(DST_RAW_FILES)
@ -19,7 +20,7 @@ $(DST_DIR)/% : $(SRC_DIR)/%
# ORG -> HTML
EXT := .org
SRC_PANDOC_FILES ?= $(shell find $(SRC_DIR) -type f -name "*$(EXT)")
SRC_PANDOC_FILES ?= $(shell find $(SRC_DIR) -type f -name "*$(EXT)" $(NO_DRAFT))
DST_PANDOC_FILES ?= $(subst $(EXT),.html, \
$(subst $(SRC_DIR),$(DST_DIR), \
$(SRC_PANDOC_FILES)))
@ -55,7 +56,7 @@ ALL += $(HTML_INDEX)
# ORG -> GEMINI
EXT := .org
SRC_GMI_FILES ?= $(shell find $(SRC_DIR) -type f -name "*$(EXT)")
SRC_GMI_FILES ?= $(shell find $(SRC_DIR) -type f -name "*$(EXT)" $(NO_DRAFT))
DST_GMI_FILES ?= $(subst $(EXT),.gmi, \
$(subst $(SRC_DIR),$(DST_DIR), \
$(SRC_GMI_FILES)))
@ -63,7 +64,7 @@ DST_GMI_FILES ?= $(subst $(EXT),.gmi, \
ALL += $(DST_GMI_FILES)
GMI := engine/org2gemini.sh
$(DST_DIR)/%.gmi: $(SRC_DIR)/%.org $(GMI)
$(DST_DIR)/%.gmi: $(SRC_DIR)/%.org $(GMI) engine/org2gemini_step1.sh
mkdir -p $(dir $@)
$(GMI) "$<" "$@"

View file

@ -7,13 +7,13 @@ dst="$2"
./engine/org2gemini_step1.sh "$src" | \
perl -pe 's#^email:\s+yann\@esposito.host\s*#$&=> /files/publickey.txt gpg\n#g;' | \
perl -pe 's#\[\[([^]]*)\]\[([^]]*)\]\]#\n=> $1 $2#g;' | \
perl -pe 's# ?\[\[([^]]*)\]\[([^]]*)\]\]#\n\n=> $1 $2\n#g;' | \
perl -pe 's#=> file:([^ ]*)\.org#=> $1.gmi#g;' | \
perl -pe 's#=> file:([^ ]*)#=> $1#g;' | \
perl -pe 's#\[\[(file:)?([^]]*)\]\]#=> $2#g;' | \
perl -pe 's#^\* *\n##' | \
perl -pe 's#^\* *\n\n##' | \
perl -pe 's#^\**[ ]*:.*:$##' | \
perl -pe 's#^\s[- ]*$##;' > "$dst"
perl -pe 's#^\s[- ]*$#\n#;' > "$dst"
{ echo ""
echo "=> /index.gmi Home"

View file

@ -13,6 +13,8 @@ BEGIN { IGNORECASE=1; }
/^#\+TITLE: / { gsub(/^#[^:]*: /,"# "); }
/^ *:[a-zA-Z_0-9]*:/ { skip=1; }
# title
/^\* / { gsub(/^\* /,"# "); }
/^\*\* / { gsub(/^\*\* /,"## "); }
/^\*\*\* / { gsub(/^\*\*\* /,"### "); }
@ -27,7 +29,7 @@ BEGIN { IGNORECASE=1; }
$0=x" "$0;
}
/^- / { gsub(/^- /,"* "); }
!skip && !htmlskip{
!skip && !htmlskip{
print;
}
/@@/ && !/@@html:/ { htmlskip = 0; }

View file

@ -14,5 +14,7 @@ echo "Optim Classes accross CSS/HTML"
# ./engine/update-file-size.sh
echo "Building RSS"
./engine/mkrss.sh
echo "Building Gemini Index"
./engine/mk-gemini-index.sh
echo "Building Gemini Atom"
./engine/mk-gemini-atom.sh