- cnts.step(counter, utype);
- full_label_ = bformat(from_ascii("%1$s %2$s:"),
- name,
- cnts.theCounter(counter, lang));
- } else
- full_label_ = bformat(from_ascii("%1$s #:"), name);
+ int val = cnts.value(counter);
+ // for longtables, we step the counter upstream
+ if (!cnts.isLongtable())
+ cnts.step(counter, utype);
+ sec = cnts.theCounter(counter, lang);
+ if (deleted && !cnts.isLongtable())
+ // un-step after deleted counter
+ cnts.set(counter, val);
+ }
+ if (labelstring != master.B_("standard")) {
+ if (!sec.empty())
+ sec += from_ascii(" ");
+ sec += bformat(from_ascii("(%1$s)"), labelstring);
+ }
+ if (sec.empty())
+ sec = from_ascii("#");
+ full_label_ = bformat(master.B_("%1$s %2$s: [[Caption label (ex. Figure 1: )]]"), name, sec);