Move the RefPrefix definitions to their own file, for easy inclusion in

other layouts. Also fix up some of those layotus.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33836 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/Makefile.am b/lib/Makefile.am
index f046cda233fe6f51bb449dd244956f688497ee37..6acb4433adbeace274126d911504998ae2b7861a 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1135,6 +1135,7 @@ dist_layouts_DATA =\
        layouts/stdlayouts.inc \
        layouts/stdletter.inc \
        layouts/stdlists.inc \
        layouts/stdlayouts.inc \
        layouts/stdletter.inc \
        layouts/stdlists.inc \

+       layouts/stdrefprefix.inc \

        layouts/stdsections.inc \
        layouts/stdstarsections.inc \
        layouts/stdstruct.inc \
        layouts/stdsections.inc \
        layouts/stdstarsections.inc \
        layouts/stdstruct.inc \

diff --git a/lib/layouts/beamer.layout b/lib/layouts/beamer.layout
index 0b7796e188cd1ca724130e0bcdf26a2b304385a3..a4a0cced011744d3ed59f77085663a72e66a043d 100644 (file)
--- a/lib/layouts/beamer.layout
+++ b/lib/layouts/beamer.layout
@@ -123,6 +123,7 @@ Style Part
   Align            Center
   LabelType        Static
   LabelString      "Part"
   Align            Center
   LabelType        Static
   LabelString      "Part"

+       RefPrefix        part

 
   # standard font definition
   Font 
 
   # standard font definition
   Font 


@@ -154,6 +155,7 @@ Style Section
   LabelType        Counter
   LabelCounter     section
   LabelString      "Section \arabic{section}"
   LabelType        Counter
   LabelCounter     section
   LabelString      "Section \arabic{section}"

+       RefPrefix        sec

   OptionalArgs     1
 
   Font 
   OptionalArgs     1
 
   Font 


@@ -196,6 +198,7 @@ Style Subsection
   LabelType        Counter
   LabelCounter     subsection
   LabelString      "Subsection \arabic{section}.\arabic{subsection}"
   LabelType        Counter
   LabelCounter     subsection
   LabelString      "Subsection \arabic{section}.\arabic{subsection}"

+       RefPrefix        sub

   OptionalArgs     1
 
   # standard font definition
   OptionalArgs     1
 
   # standard font definition


@@ -1235,4 +1238,3 @@ Preamble
     \def\gobbletableofcontents#1{\origtableofcontents}
   }
 EndPreamble
     \def\gobbletableofcontents#1{\origtableofcontents}
   }
 EndPreamble

-

diff --git a/lib/layouts/egs.layout b/lib/layouts/egs.layout
index 598750234256007fb6652ecf5c85bba2ff79dd42..74ff81c65c5471f8c8bf43c96b9bead52db9ba99 100644 (file)
--- a/lib/layouts/egs.layout
+++ b/lib/layouts/egs.layout
@@ -656,3 +656,4 @@ Input stdinsets.inc
 Input stdfloats.inc
 Input numarticle.inc
 Input stdcounters.inc
 Input stdfloats.inc
 Input numarticle.inc
 Input stdcounters.inc

+Input stdrefprefix.inc

diff --git a/lib/layouts/isprs.layout b/lib/layouts/isprs.layout
index e7b7182746027d70039c0b0d7aa137fb6b9eae44..04651773ab2e1da3a6b146491c8f4e8d06ed6e67 100644 (file)
--- a/lib/layouts/isprs.layout
+++ b/lib/layouts/isprs.layout
@@ -239,4 +239,3 @@ Style Acknowledgements
     Size               Normal
   EndFont
 End
     Size               Normal
   EndFont
 End

-

diff --git a/lib/layouts/ltugboat.layout b/lib/layouts/ltugboat.layout
index 6b6ca8fab28fdc7a26168a31efba66218537996d..bc9a28e933c4be97e49f0669466ff1c0f78f1516 100644 (file)
--- a/lib/layouts/ltugboat.layout
+++ b/lib/layouts/ltugboat.layout
@@ -130,6 +130,7 @@ Input stdlayouts.inc
 Input stdfloats.inc
 Input stdcounters.inc
 Input stdinsets.inc
 Input stdfloats.inc
 Input stdcounters.inc
 Input stdinsets.inc

+Input stdrefprefix.inc

 
 
 Style Title
 
 
 Style Title

diff --git a/lib/layouts/stdrefprefix.inc b/lib/layouts/stdrefprefix.inc
new file mode 100644 (file)
index 0000000..872108c
--- /dev/null
+++ b/lib/layouts/stdrefprefix.inc
@@ -0,0 +1,38 @@
+# Standard RefPrefix definitions. 
+# This defines the label prefixes for use with refstyle.sty.
+#
+# Author: Richard Heck <rgheck@comcast.net>
+#
+# Note that this file is included in stdsections.inc, which is included
+# in stdclass.inc, so any file that includes either of these will get
+# the standard RefPrefix definitions.
+
+Format 25
+
+IfStyle Part
+       RefPrefix part
+End
+
+IfStyle Chapter
+       RefPrefix chap
+End
+
+IfStyle Section
+       RefPrefix sec
+End
+
+IfStyle Subsection
+       RefPrefix sub
+End
+
+IfStyle Subsubsection
+       RefPrefix sub
+End
+
+IfStyle Paragraph
+       RefPrefix par
+End
+
+IfStyle Subparagraph
+       RefPrefix par
+End

diff --git a/lib/layouts/stdsections.inc b/lib/layouts/stdsections.inc
index 0a1cf60c36f26e8d0ef5903313963153cbfc9210..e0bd201804476bc162fd792007378231748349b5 100644 (file)
--- a/lib/layouts/stdsections.inc
+++ b/lib/layouts/stdsections.inc
@@ -26,7 +26,6 @@ Style Part
        BottomSep             4
        ParSep                0.8
        Align                 Center
        BottomSep             4
        ParSep                0.8
        Align                 Center

-       RefPrefix             part

        Alignpossible         Center
        Font
          Series              Bold
        Alignpossible         Center
        Font
          Series              Bold


@@ -54,7 +53,6 @@ Style Chapter
        ParSep                0.8
        Align                 Block
        OptionalArgs          1
        ParSep                0.8
        Align                 Block
        OptionalArgs          1

-       RefPrefix             cha

        Font
          Series              Bold
          Size                Huge
        Font
          Series              Bold
          Size                Huge


@@ -80,7 +78,6 @@ Style Section
        ParSep                0.7
        Align                 Block
        OptionalArgs          1
        ParSep                0.7
        Align                 Block
        OptionalArgs          1

-       RefPrefix             sec

        Font
          Series              Bold
          Size                Larger
        Font
          Series              Bold
          Size                Larger


@@ -101,7 +98,6 @@ Style Subsection
          Series              Bold
          Size                Large
        EndFont
          Series              Bold
          Size                Large
        EndFont

-       RefPrefix             sub

        HTMLTag               h3
 End
 
        HTMLTag               h3
 End
 


@@ -117,7 +113,6 @@ Style Subsubsection
          Series              Bold
          Size                Normal
        EndFont
          Series              Bold
          Size                Normal
        EndFont

-       RefPrefix             sub

        HTMLTag               h4
 End
 
        HTMLTag               h4
 End
 


@@ -129,7 +124,6 @@ Style Paragraph
        LatexName             paragraph
        TopSep                0.4
        BottomSep             0
        LatexName             paragraph
        TopSep                0.4
        BottomSep             0

-       RefPrefix             par

 End
 
 
 End
 
 


@@ -140,7 +134,7 @@ Style Subparagraph
        LatexName             subparagraph
        NextNoIndent          0
        LeftMargin            MM
        LatexName             subparagraph
        NextNoIndent          0
        LeftMargin            MM

-       RefPrefix             subp

 End
 
 End
 

+Input stdrefprefix.inc

 Input numarticle.inc
 Input numarticle.inc

diff --git a/lib/layouts/tufte-book.layout b/lib/layouts/tufte-book.layout
index 9ea864e5ee9e6111a6b5fdadc6252174f544cb3d..845a6d6443d58e30429ca8e811ca7b1aa0f53cda 100644 (file)
--- a/lib/layouts/tufte-book.layout
+++ b/lib/layouts/tufte-book.layout
@@ -57,6 +57,7 @@ Style Chapter
        BottomSep       0.8
        ParSep          0.8
        Align           Block
        BottomSep       0.8
        ParSep          0.8
        Align           Block

+       RefPrefix chap

        OptionalArgs    1
        Font
          Series        Bold
        OptionalArgs    1
        Font
          Series        Bold


@@ -80,6 +81,7 @@ Style Section
        BottomSep       0.7
        ParSep          0.7
        Align           Block
        BottomSep       0.7
        ParSep          0.7
        Align           Block

+       RefPrefix sec

        OptionalArgs    1
        Font
          Series        Bold
        OptionalArgs    1
        Font
          Series        Bold


@@ -94,6 +96,7 @@ Style Subsection
        TopSep          0.9
        BottomSep       0.5
        ParSep          0.5
        TopSep          0.9
        BottomSep       0.5
        ParSep          0.5

+       RefPrefix sub

        Font
          Series        Bold
          Size          Large
        Font
          Series        Bold
          Size          Large