Add a bunch of RefFormat and PrettyFormat tags.

lib/layouts/AEA.layout

@@ -201,6 +201,11 @@ Style Axiom
 	EndPreamble
 End
 
+Counter case
+	GuiName Case
+	PrettyFormat "Case ##"
+End
+
 Style Case
 	CopyStyle	Remark
 	LatexName	case
@@ -307,6 +312,11 @@ Style Proposition
 	EndPreamble
 End
 
+Counter remark
+	GuiName Remark
+	PrettyFormat "Remark ##"
+End
+
 Style Remark
 	LatexName	remark
 	LabelString	"Remark \theremark."
@@ -315,6 +325,11 @@ Style Remark
 	EndPreamble
 End
 
+Counter solution
+	GuiName Solution
+	PrettyFormat "Solution ##"
+End
+
 Style Solution
 	CopyStyle	Remark
 	LatexName	solution
@@ -325,6 +340,11 @@ Style Solution
 	EndPreamble
 End
 
+Counter summary
+	GuiName Summary
+	PrettyFormat "Summary ##"
+End
+
 Style Summary
 	LatexName	summary
 	LabelCounter	summary
@@ -349,15 +369,3 @@ Style Proof
 	EndPreamble
 End
 
-Counter case
-	GuiName Case
-End
-Counter remark
-	GuiName Remark
-End
-Counter summary
-	GuiName Summary
-End
-Counter solution
-	GuiName Solution
-End

lib/layouts/IEEEtran.layout

@@ -47,6 +47,21 @@ End
 
 Counter		theorem
 	GuiName Theorem
+	RefFormat thm "Theorem \arabic{theorem}"
+	RefFormat cor "Corollary \arabic{theorem}"
+	RefFormat lem "Lemma \arabic{theorem}"
+	RefFormat prop "Lemma \arabic{theorem}"
+	RefFormat conj "Conjecture \arabic{theorem}"
+	RefFormat def "Definition \arabic{theorem}"
+	RefFormat exa "Example \arabic{theorem}"
+	RefFormat prob "Problem \arabic{theorem}"
+	RefFormat exer "Exercise \arabic{theorem}"
+	RefFormat solu "Solution \arabic{theorem}"
+	RefFormat rem "Remark \arabic{theorem}"
+	RefFormat claim "Claim \arabic{theorem}"
+	RefFormat fact "Fact \arabic{theorem}"
+	RefFormat cri "Criterion \arabic{theorem}"
+	RefFormat alg "Algorithm \arabic{theorem}"
 End
 
 Input stdcounters.inc

lib/layouts/acmart.layout

@@ -571,6 +571,13 @@ OutlinerName thm "Definitions & Theorems"
 Counter theorem
 	GuiName Theorem
 	Within                section
+	RefFormat thm "Theorem \arabic{theorem}"
+	RefFormat cor "Corollary \arabic{theorem}"
+	RefFormat lem "Lemma \arabic{theorem}"
+	RefFormat prop "Lemma \arabic{theorem}"
+	RefFormat conj "Conjecture \arabic{theorem}"
+	RefFormat def "Definition \arabic{theorem}"
+	RefFormat exa "Example \arabic{theorem}"
 End
 
 Style Theorem

lib/layouts/algorithm2e.module

@@ -28,6 +28,7 @@ Float
 	UsesFloatPkg          false
 	ListCommand           listofalgorithms
 	RefPrefix             alg
+	PrettyFormat          "Algorithm ##"
 End
 
 Style Algorithm

lib/layouts/beamer.layout

@@ -1730,6 +1730,7 @@ Float
   IsPredefined     true
   UsesFloatPkg     false
   ListCommand      listoftables
+  PrettyFormat     "Table ##"
 End
 
 Float
@@ -1743,6 +1744,7 @@ Float
   IsPredefined     true
   UsesFloatPkg     false
   ListCommand      listoffigures
+  PrettyFormat     "Figure ##"
 End
 
 

lib/layouts/broadway.layout

@@ -25,11 +25,13 @@ DefaultStyle Dialogue
 
 Counter act
 	GuiName "Act Number"
+	PrettyFormat "Act ##"
 End
 
 
 Counter scene
 	GuiName "Scene Number"
+	PrettyFormat "Scene ##"
 End
 
 

lib/layouts/elsart.layout

@@ -37,15 +37,6 @@ End
 TitleLatexType Environment
 TitleLatexName frontmatter
 
-Counter summ
-	GuiName Summary
-End
-
-
-Counter case
-	GuiName Case
-End
-
 
 Style Standard
 	Category              MainText
@@ -304,6 +295,18 @@ End
 
 Counter theorem
 	GuiName Theorem
+	RefFormat thm "Theorem \arabic{theorem}"
+	RefFormat cor "Corollary \arabic{theorem}"
+	RefFormat lem "Lemma \arabic{theorem}"
+	RefFormat prop "Lemma \arabic{theorem}"
+	RefFormat conj "Conjecture \arabic{theorem}"
+	RefFormat def "Definition \arabic{theorem}"
+	RefFormat exa "Example \arabic{theorem}"
+	RefFormat prob "Problem \arabic{theorem}"
+	RefFormat exer "Exercise \arabic{theorem}"
+	RefFormat solu "Solution \arabic{theorem}"
+	RefFormat rem "Remark \arabic{theorem}"
+	RefFormat claim "Claim \arabic{theorem}"
 End
 
 
@@ -520,6 +523,11 @@ Style Claim
 End
 
 
+Counter summ
+	GuiName Summary
+	PrettyFormat "Summary ##"
+End
+
 Style Summary
 	CopyStyle             Theorem
 	LatexName             summ
@@ -529,9 +537,15 @@ Style Summary
 	DocBookWrapperAttr    role='summary'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	RefPrefix             summ
 End
 
 
+Counter case
+	GuiName Case
+	PrettyFormat "Case ##"
+End
+
 Style Case
 	CopyStyle             Theorem
 	LatexName             case
@@ -541,6 +555,7 @@ Style Case
 	DocBookWrapperAttr    role='case'
 	DocBookTag            para
 	DocBookGenerateTitle  true
+	RefPrefix             case
 End
 
 
@@ -560,6 +575,7 @@ Style Acknowledgment
 	EndFont
 	DocBookTag            para
 	DocBookWrapperTag     acknowledgements
+	RefPrefix             ack
 End
 
 

lib/layouts/eqs-within-sections.module

@@ -17,4 +17,5 @@ Counter equation
 	GuiName Equation
 	Within section
 	LabelString "\thesection.\arabic{equation}"
+	PrettyFormat "(\thesection.\arabic{equation})"
 End

lib/layouts/heb-article.layout

@@ -11,6 +11,12 @@ Input article
 
 Counter theorem
 	Within	section
+	RefFormat thm "Theorem \thesection.\arabic{theorem}"
+	RefFormat cor "Corollary \thesection.\arabic{theorem}"
+	RefFormat lem "Lemma \thesection.\arabic{theorem}"
+	RefFormat claim "Claim \thesection.\arabic{theorem}"
+	RefFormat def "Definition \thesection.\arabic{theorem}"
+	RefFormat rem "Remark \thesection.\arabic{theorem}"
 End
 
 Style Theorem

lib/layouts/ijmpc.layout

@@ -466,6 +466,7 @@ End
 Counter claim
 	GuiName Claim
   Within	section
+  PrettyFormat "Claim ##"
 End
 Style Claim
   LabelCounter	claim

lib/layouts/ijmpd.layout

@@ -431,6 +431,7 @@ End
 Counter theorem
 	GuiName Theorem
   Within	section
+  PrettyFormat "Theorem ##"
 End
 Style Theorem
   ResetArgs      1
@@ -448,6 +449,7 @@ End
 Counter remark
 	GuiName Remark
   Within	section
+  PrettyFormat "Remark ##"
 End
 Style Remark
   LabelString	"Remark \theremark."
@@ -460,6 +462,7 @@ End
 Counter corollary
 	GuiName Corollary
   Within	section
+  PrettyFormat "Corollary ##"
 End
 Style Corollary
   LabelString	"Corollary \thecorollary."
@@ -468,6 +471,7 @@ End
 Counter lemma
 	GuiName Lemma
   Within	section
+  PrettyFormat "Lemma ##"
 End
 Style Lemma
   LabelString	"Lemma \thelemma."
@@ -484,6 +488,7 @@ End
 Counter question
 	GuiName Question
   Within	section
+  PrettyFormat "Question ##"
 End
 Style Question
   LabelString	"Question \thequestion."
@@ -495,6 +500,7 @@ End
 Counter claim
 	GuiName Claim
   Within	section
+  PrettyFormat "Claim ##"
 End
 Style Claim
   LabelCounter	claim
@@ -507,6 +513,7 @@ End
 Counter conjecture
 	GuiName Conjecture
   Within	section
+  PrettyFormat "Conjecture ##"
 End
 Style Conjecture
   LabelString	"Conjecture \theconjecture."
@@ -518,6 +525,7 @@ End
 Counter prop
 	GuiName Prop(osition)
   Within	section
+  PrettyFormat "Proposition ##"
 End
 
 Counter appendix

lib/layouts/linguistics.module

@@ -18,42 +18,49 @@ Counter example
 	GuiName Example
 	Within               chapter
 	LabelString          "(\arabic{example})"
+	PrettyFormat         "(\arabic{example})"
 End
 
 Counter examplei
 	GuiName              "Numbered Example (Multiline)"
 	Within               chapter
 	LabelString          "(\arabic{examplei})"
+	PrettyFormat         "(\arabic{examplei})"
 End
 
 Counter subexample
 	GuiName              Subexample
 	Within               examplei
 	LabelString          "\theexamplei (\alph{subexample})"
+	PrettyFormat         "\theexamplei (\alph{subexample})"
 End
 
 Counter subexamplei
 	GuiName              Subexample
 	Within               examplei
 	LabelString          "\theexamplei (\alph{subexamplei})"
+	PrettyFormat         "\theexamplei (\alph{subexamplei})"
 End
 
 Counter subexampleii
 	GuiName              Subexample
 	Within               examplei
 	LabelString          "\theexamplei (\alph{subexampleii})"
+	PrettyFormat         "\theexamplei (\alph{subexampleii})"
 End
 
 Counter subexampleiii
 	GuiName              Subexample
 	Within               examplei
 	LabelString          "\theexamplei (\alph{subexampleiii})"
+	PrettyFormat         "\theexamplei (\alph{subexampleiii})"
 End
 
 Counter subexampleiv
 	GuiName              Subexample
 	Within               examplei
 	LabelString          "\theexamplei (\alph{subexampleiv})"
+	PrettyFormat         "\theexamplei (\alph{subexampleiv})"
 End
 
 #
@@ -598,5 +605,6 @@ Float
 	ListName              "List of Tableaux"
 	IsPredefined          false
 	UsesFloatPkg          true
+	PrettyFormat          "Tableaux ##"
 End
 

lib/layouts/numreport.inc

@@ -8,12 +8,14 @@ Counter chapter
 	Within                ""
 	LabelString	      "\arabic{chapter}"
 	LabelStringAppendix   "\Alph{chapter}"
+	PrettyFormat "Chapter ##"
 End
 
 Counter section
 	GuiName Section
 	Within                chapter
 	LabelString	      ""
+	PrettyFormat "Section ##"
 End
 
 Float
@@ -41,4 +43,5 @@ End
 Counter footnote
 	GuiName Footnote
 	Within		      chapter
+	PrettyFormat 	"footnote \arabic{footnote}"
 End

lib/layouts/powerdot.layout

@@ -569,6 +569,7 @@ Float
 	UsesFloatPkg          false
 	ListCommand           listoftables
 	RefPrefix             tab
+	PrettyFormat          "Table ##"
 End
 
 
@@ -586,6 +587,7 @@ Float
 	UsesFloatPkg          false
 	ListCommand           listoffigures
 	RefPrefix             fig
+	PrettyFormat          "Figure ##"
 End
 
 
@@ -602,6 +604,7 @@ Float
 	IsPredefined          false
 	UsesFloatPkg          true
 	RefPrefix             alg
+	PrettyFormat          "Algorithm ##"
 End
 
 ###
@@ -609,21 +612,25 @@ End
 ###
 Counter enumi
 	GuiName "Numbered List (Level 1)"
+	PrettyFormat         "(\arabic{enumi})"
 End
 
 Counter enumii
 	GuiName "Numbered List (Level 2)"
   Within        enumi
+	PrettyFormat         "(\arabic{enumii})"
 End
 
 Counter enumiii
 	GuiName "Numbered List (Level 3)"
   Within        enumii
+	PrettyFormat         "(\arabic{enumiii})"
 End
 
 Counter enumiv
 	GuiName "Numbered List (Level 4)"
   Within        enumiii
+	PrettyFormat         "(\arabic{enumiv})"
 End
 
 Counter bibitem

lib/layouts/revtex4-x.inc

@@ -320,6 +320,7 @@ Float
 	IsPredefined	false
 	UsesFloatPkg	true
 	RefPrefix		alg
+	PrettyFormat    "Algorithm ##"
 End
 
 
@@ -335,6 +336,7 @@ Float
 	Style			plain
 	Type			video
 	UsesFloatPkg	false
+	PrettyFormat    "Video ##"
 End
 
 

lib/layouts/sciposter.layout

@@ -97,6 +97,7 @@ Float
 	IsPredefined          true
 	UsesFloatPkg          false
 	RefPrefix             alg
+	PrettyFormat          "Algorithm ##"
 End
 
 Float
@@ -111,6 +112,7 @@ Float
 	UsesFloatPkg          false
 	ListCommand           listoffigures
 	RefPrefix             fig
+	PrettyFormat          "Figure ##"
 End
 
 Float
@@ -125,6 +127,7 @@ Float
 	UsesFloatPkg          false
 	ListCommand           listoftables
 	RefPrefix             tab
+	PrettyFormat          "Table ##"
 End
 
 InsetLayout "Flex:Giant"

lib/layouts/scrbook.layout

@@ -30,6 +30,7 @@ Counter equation
 	GuiName Equation
 	Within chapter
 	LabelString "\thechapter.\arabic{equation}"
+	PrettyFormat "equation \thechapter.\arabic{equation}"
 End
 
 

lib/layouts/scrclass.inc

@@ -46,8 +46,6 @@ Input stdfloats.inc
 
 # Adapt enumii counter display to KOMA default
 Counter enumii
-	GuiName "Numbered List (Level 2)"
-	Within               enumi
 	LabelString          "\alph{enumii})"
 End
 

lib/layouts/stdcounters.inc

@@ -94,6 +94,6 @@ End
 
 Counter thanks
 	GuiName "Footnote (Title)"
-	PrettyFormat         "Footnote ##"
+	PrettyFormat         "Footnote \arabic{footnote}"
 	LabelString	     "\fnsymbol{thanks}"
 End

lib/layouts/stdfloats.inc

@@ -20,6 +20,7 @@ Float
 	UsesFloatPkg          false
 	ListCommand           listoftables
 	RefPrefix             tab
+	PrettyFormat          "Table ##"
 End
 
 
@@ -35,6 +36,7 @@ Float
 	UsesFloatPkg          false
 	ListCommand           listoffigures
 	RefPrefix             fig
+	PrettyFormat          "Figure ##"
 End
 
 
@@ -49,6 +51,7 @@ Float
 	IsPredefined          false
 	UsesFloatPkg          true
 	RefPrefix             alg
+	PrettyFormat          "Algorithm ##"
 End
 
 

lib/layouts/theorems-ams.module

@@ -21,6 +21,21 @@ Requires	amsmath,amsthm
 Counter theorem
 	GuiName Theorem
 	LaTeXName thm
+	RefFormat thm "Theorem \arabic{theorem}"
+	RefFormat cor "Corollary \arabic{theorem}"
+	RefFormat lem "Lemma \arabic{theorem}"
+	RefFormat prop "Lemma \arabic{theorem}"
+	RefFormat conj "Conjecture \arabic{theorem}"
+	RefFormat def "Definition \arabic{theorem}"
+	RefFormat exa "Example \arabic{theorem}"
+	RefFormat prob "Problem \arabic{theorem}"
+	RefFormat exer "Exercise \arabic{theorem}"
+	RefFormat solu "Solution \arabic{theorem}"
+	RefFormat rem "Remark \arabic{theorem}"
+	RefFormat claim "Claim \arabic{theorem}"
+	RefFormat fact "Fact \arabic{theorem}"
+	RefFormat cri "Criterion \arabic{theorem}"
+	RefFormat alg "Algorithm \arabic{theorem}"
 End
 
 Input theorems-order.inc

lib/layouts/theorems-case.inc

@@ -9,22 +9,26 @@
 Format 104
 
 Counter casei
-	GuiName "Case (Level 1)"
+	GuiName "Case (Level 1)" 
-        LabelString "Case \arabic{casei}."
+	PrettyFormat "Case \arabic{casei}"
+	LabelString "Case \arabic{casei}."
 End
 Counter caseii
 	GuiName "Case (Level 2)"
         Within casei
         LabelString "Case \roman{caseii}."
+        PrettyFormat "Case \roman{caseii}"
 End
 Counter caseiii
 	GuiName "Case (Level 3)"
         Within caseii
         LabelString "Case \alph{caseiii}."
+        PrettyFormat "Case \alph{caseiii}"
 End
 Counter caseiv
 	GuiName "Case (Level 4)"
         Within caseiii
+        PrettyForamt "Case \arabic{caseiv}"
         LabelString "Case \arabic{caseiv}."
 End
 

lib/layouts/theorems-chap.module

@@ -16,6 +16,21 @@ Counter theorem
 	GuiName Theorem
 	Within chapter
 	LaTeXName thm
+	RefFormat thm "Theorem \thechapter.\arabic{theorem}"
+	RefFormat cor "Corollary \thechapter.\arabic{theorem}"
+	RefFormat lem "Lemma \thechapter.\arabic{theorem}"
+	RefFormat prop "Lemma \thechapter.\arabic{theorem}"
+	RefFormat conj "Conjecture \thechapter.\arabic{theorem}"
+	RefFormat def "Definition \thechapter.\arabic{theorem}"
+	RefFormat exa "Example \thechapter.\arabic{theorem}"
+	RefFormat prob "Problem \thechapter.\arabic{theorem}"
+	RefFormat exer "Exercise \thechapter.\arabic{theorem}"
+	RefFormat solu "Solution \thechapter.\arabic{theorem}"
+	RefFormat rem "Remark \thechapter.\arabic{theorem}"
+	RefFormat claim "Claim \thechapter.\arabic{theorem}"
+	RefFormat fact "Fact \thechapter.\arabic{theorem}"
+	RefFormat cri "Criterion \thechapter.\arabic{theorem}"
+	RefFormat alg "Algorithm \thechapter.\arabic{theorem}"
 End
 
 Style Theorem

lib/layouts/theorems-counters-bytype.inc

@@ -4,47 +4,60 @@ Format 104
 Counter theorem
 	GuiName Theorem
 	LaTeXName thm
+	PrettyFormat "Theorem \arabic{theorem}"
 End
 Counter corollary
 	GuiName Corollary
 	LaTeXName cor
+	PrettyFormat "Corollary \arabic{theorem}"
 End
 Counter lemma
 	GuiName Lemma
 	LaTeXName lem
+	PrettyFormat "Lemma \arabic{theorem}"
 End
 Counter proposition
 	GuiName Proposition
 	LaTeXName prop
+	PrettyFormat "Proposition \arabic{theorem}"
 End
 Counter conjecture
 	GuiName Conjecture
+	PrettyFormat "Conjecture \arabic{theorem}"
 End
 Counter fact
 	GuiName Fact
+	PrettyFormat "Fact \arabic{theorem}"
 End
 Counter definition
 	GuiName Definition
 	LaTeXName defn
+	PrettyFormat "Definition \arabic{theorem}"
 End
 Counter example
 	GuiName Example
+	PrettyFormat "Example \arabic{theorem}"
 End
 Counter problem
 	GuiName Problem
+	PrettyFormat "Problem \arabic{theorem}"
 End
 Counter exercise
 	GuiName Exercise
 	LaTeXName xca
+	PrettyFormat "Exercise \arabic{theorem}"
 End
 Counter solution
 	GuiName Solution
 	LaTeXName sol
+	PrettyFormat "Solution \arabic{theorem}"
 End
 Counter remark
 	GuiName Remark
 	LaTeXName rem
+	PrettyFormat "Remark \arabic{theorem}"
 End
 Counter claim
 	GuiName Claim
+	PrettyFormat "Claim \arabic{theorem}"
 End

lib/layouts/theorems-counters-extended-bytype.inc

@@ -3,33 +3,43 @@
 Format 104
 Counter criterion
 	GuiName Criterion
+	PrettyFormat "Criterion \arabic{theorem}"
 End
 Counter algorithm
 	GuiName Algorithm
 	LaTeXName lyxalgorithm
+	PrettyFormat "Algorithm \arabic{theorem}"
 End
 Counter axiom
 	GuiName Axiom
 	LaTeXName ax
+	PrettyFormat "Axiom \arabic{theorem}"
 End
 Counter condition
 	GuiName Condition
+	PrettyFormat "Condition \arabic{theorem}"
 End
 Counter note
 	GuiName Note
+	PrettyFormat "Note \arabic{theorem}"
 End
 Counter notation
 	GuiName Notation
+	PrettyFormat "Notation \arabic{theorem}"
 End
 Counter summary
 	GuiName Summary
+	PrettyFormat "Summary \arabic{theorem}"
 End
 Counter conclusion
 	GuiName Conclusion
+	PrettyFormat "Conclusion \arabic{theorem}"
 End
 Counter assumption
 	GuiName Assumption
+	PrettyFormat "Assumption \arabic{theorem}"
 End
 Counter question
 	GuiName Question
+	PrettyFormat "Question \arabic{theorem}"
 End

lib/layouts/theorems-sec.module

@@ -15,6 +15,21 @@ Counter theorem
 	GuiName Theorem
 	Within section
 	LaTeXName thm
+	RefFormat thm "Theorem \thesection.\arabic{theorem}"
+	RefFormat cor "Corollary \thesection.\arabic{theorem}"
+	RefFormat lem "Lemma \thesection.\arabic{theorem}"
+	RefFormat prop "Lemma \thesection.\arabic{theorem}"
+	RefFormat conj "Conjecture \thesection.\arabic{theorem}"
+	RefFormat def "Definition \thesection.\arabic{theorem}"
+	RefFormat exa "Example \thesection.\arabic{theorem}"
+	RefFormat prob "Problem \thesection.\arabic{theorem}"
+	RefFormat exer "Exercise \thesection.\arabic{theorem}"
+	RefFormat solu "Solution \thesection.\arabic{theorem}"
+	RefFormat rem "Remark \thesection.\arabic{theorem}"
+	RefFormat claim "Claim \thesection.\arabic{theorem}"
+	RefFormat fact "Fact \thesection.\arabic{theorem}"
+	RefFormat cri "Criterion \thesection.\arabic{theorem}"
+	RefFormat alg "Algorithm \thesection.\arabic{theorem}"
 End
 
 Style Theorem

lib/layouts/theorems-std.module

@@ -14,6 +14,19 @@ Format 104
 Counter theorem
 	GuiName Theorem
 	LaTeXName thm
+	RefFormat thm "Theorem \arabic{theorem}"
+	RefFormat cor "Corollary \arabic{theorem}"
+	RefFormat lem "Lemma \arabic{theorem}"
+	RefFormat prop "Lemma \arabic{theorem}"
+	RefFormat conj "Conjecture \arabic{theorem}"
+	RefFormat fact "Fact \arabic{theorem}"
+	RefFormat def "Definition \arabic{theorem}"
+	RefFormat exa "Example \arabic{theorem}"
+	RefFormat prob "Problem \arabic{theorem}"
+	RefFormat exer "Exercise \arabic{theorem}"
+	RefFormat solu "Solution \arabic{theorem}"
+	RefFormat rem "Remark \arabic{theorem}"
+	RefFormat claim "Claim \arabic{theorem}"
 End
 
 Input theorems.inc

lib/layouts/theorems-without-preamble.inc

@@ -84,6 +84,7 @@ End
 
 Counter		corollary
 	GuiName Corollary
+	PrettyFormat "Corollary ##"
 End
 Style Corollary
 	CopyStyle	Theorem
@@ -106,6 +107,7 @@ End
 
 Counter		lemma
 	GuiName Lemma
+	PrettyFormat "Lemma ##"
 End
 Style Lemma
 	CopyStyle	Theorem
@@ -128,6 +130,7 @@ End
 
 Counter		proposition
 	GuiName Proposition
+	PrettyFormat "Proposition ##"
 End
 Style Proposition
 	CopyStyle	Theorem
@@ -150,6 +153,7 @@ End
 
 Counter		prop
 	GuiName Prop(osition)
+	PrettyFormat "Proposition ##"
 End
 Style Prop
 	CopyStyle	Theorem
@@ -172,6 +176,7 @@ End
 
 Counter		conjecture
 	GuiName Conjecture
+	PrettyFormat "Conjecture ##"
 End
 Style Conjecture
 	CopyStyle	Theorem
@@ -201,6 +206,7 @@ End
 
 Counter		fact
 	GuiName Fact
+	PrettyFormat "Fact ##"
 End
 Style Fact
 	CopyStyle	Theorem
@@ -223,6 +229,7 @@ End
 
 Counter		definition
 	GuiName Definition
+	PrettyFormat "Definition ##"
 End
 Style Definition
 	CopyStyle	Theorem
@@ -253,6 +260,7 @@ End
 
 Counter		example
 	GuiName Example
+	PrettyFormat "Example ##"
 End
 Style Example
 	CopyStyle	Conjecture
@@ -274,6 +282,7 @@ End
 
 Counter		problem
 	GuiName Problem
+	PrettyFormat "Problem ##"
 End
 Style Problem
 	CopyStyle	Definition
@@ -298,7 +307,8 @@ End
 
 Counter		prob
 	GuiName Prob(lem)
-  Within	chapter
+	Within	chapter
+	PrettyFormat "Problem ##"
 End
 # Prob does not copy a style to avoid preamble code
 Style Prob
@@ -336,6 +346,7 @@ End
 
 Counter		solution
 	GuiName Solution
+	PrettyFormat "Solution ##"
 End
 Style Solution
 	CopyStyle	Problem
@@ -378,6 +389,7 @@ End
 
 Counter		exercise
 	GuiName Exercise
+	PrettyFormat "Exercise ##"
 End
 Style Exercise
 	CopyStyle	Definition
@@ -401,6 +413,7 @@ End
 
 Counter		remark
 	GuiName Remark
+	PrettyFormat "Remark ##"
 End
 Style Remark
 	CopyStyle	Conjecture
@@ -442,6 +455,7 @@ End
 
 Counter		case
 	GuiName Case
+	PrettyFormat "Case ##"
 End
 Style Case
 	CopyStyle	Remark
@@ -465,6 +479,7 @@ End
 
 Counter		property
 	GuiName Property
+	PrettyFormat "Property ##"
 End
 Style Property
 	CopyStyle	Claim
@@ -488,6 +503,7 @@ End
 
 Counter		question
 	GuiName Question
+	PrettyFormat "Question ##"
 End
 Style Question
 	CopyStyle	Claim
@@ -511,6 +527,7 @@ End
 
 Counter		note
 	GuiName Note
+	PrettyFormat "Note ##"
 End
 Style Note
 	CopyStyle	Claim

lib/layouts/tufte-book.layout

@@ -255,10 +255,12 @@ End
 # this steps the counters
 Counter		marginfigure
 	GuiName "Margin Figure"
+	PrettyFormat "Margin Figure ##"
 End
 
 Counter		margintable
 	GuiName "Margin Table"
+	PrettyFormat "Margin Table ##"
 End
 
 # define the floats