Revert annex-f formula

Also add tables/figures/equations, because why not.

Fixes #10

Author: timsong-cpp

gen_html_std.sh

@@ -46,12 +46,11 @@ latexmk -pdf std
 cp std.pdf std_orig.pdf
 
 # create the "annex-f" file that maps stable names to section numbers
-  grep '^\\newlabel{' *.aux \
-| grep -v '\\newlabel{\(fig\|tab\):' \
-| sed 's/^.*\.aux://' \
-| sed 's/^\\newlabel{\([^}]*\)}{{\([^}]*\)}.*/\1 \2/' \
+  grep -h '^\\newlabel{' *.aux \
+| sed 's/\\newlabel{\([^}]*\)}.*TitleReference {\([^}]*\)}.*/\1 \2/'   \
+| sed 's/\\newlabel{\([^}]*\)}{{\(Clause\|Annex\) \([^}]*\)}.*/\1 \3/' \
+| sed 's/\\newlabel{\(eq:[^}]*\)}{{\([^}]*\)}.*/\1 \2/'                \
 | grep -v '^\\' \
-| sed 's/\(Clause\|Annex\) //' \
 | sort > annex-f
 
 if [ -f ../../htmlgen.patch ]