>>>>> "Lars" == Lars Gullik Bjønnes <[EMAIL PROTECTED]> writes:
Lars> And a solution localized to the gettext machinery, so that
Lars> sounds very correct to me.
So this is what you want for 1.3.6cvs?
JMarc
Index: po/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/po/ChangeLog,v
retrieving revision 1.156.2.96
diff -u -p -r1.156.2.96 ChangeLog
--- po/ChangeLog 26 Apr 2005 15:24:58 -0000 1.156.2.96
+++ po/ChangeLog 27 Apr 2005 14:52:21 -0000
@@ -1,3 +1,8 @@
+2005-04-27 Jean-Marc Lasgouttes <[EMAIL PROTECTED]>
+
+ * Makefile.in.in (layouts_l10n.pot): replace underscores with
+ spaces in Style definition.
+
2005-04-25 Michael Schmitt <[EMAIL PROTECTED]>
* *.po: Adjust 16 po files to '_'-less styles in layout files
Index: po/Makefile.in.in
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/po/Makefile.in.in,v
retrieving revision 1.28.2.8
diff -u -p -r1.28.2.8 Makefile.in.in
--- po/Makefile.in.in 26 Apr 2005 15:24:58 -0000 1.28.2.8
+++ po/Makefile.in.in 27 Apr 2005 14:52:21 -0000
@@ -262,6 +262,7 @@ $(srcdir)/layouts_l10n.pot: $(top_srcdir
line=$$0; \
sub(/Style /, "", line); \
gsub(/\"/, "", line); \
+ gsub(/_/, " ", line); \
printf("#: %s:%d\nmsgid \"%s\"\nmsgstr \"\"\n\n", \
FILENAME, FNR, line); \
} \
Index: lib/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/ChangeLog,v
retrieving revision 1.363.2.107
diff -u -p -r1.363.2.107 ChangeLog
--- lib/ChangeLog 26 Apr 2005 15:24:56 -0000 1.363.2.107
+++ lib/ChangeLog 27 Apr 2005 14:52:21 -0000
@@ -1,3 +1,9 @@
+2005-04-27 Jean-Marc Lasgouttes <[EMAIL PROTECTED]>
+
+ * layouts/*.layout:
+ * layouts/*.inc: revert the previous patch. Actually, all Style,
+ NoStyle and CopyStyle commands use a _ instead of quotes for spaces.
+
2005-04-22 Michael Schmitt <[EMAIL PROTECTED]>
* layouts/*.layout: surround styles with '_' (space) by quotes
Index: lib/layouts/aguplus.inc
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/layouts/aguplus.inc,v
retrieving revision 1.2.2.2
diff -u -p -r1.2.2.2 aguplus.inc
--- lib/layouts/aguplus.inc 26 Apr 2005 15:24:56 -0000 1.2.2.2
+++ lib/layouts/aguplus.inc 27 Apr 2005 14:52:22 -0000
@@ -70,7 +70,7 @@ Preamble
EndPreamble
# Headers style definition
-Style "Left Header"
+Style Left_Header
Margin Static
LatexType Command
LatexName lefthead
@@ -96,36 +96,36 @@ Style "Left Header"
End
-Style "Right Header"
- CopyStyle "Left Header"
+Style Right_Header
+ CopyStyle Left_Header
LatexName righthead
LeftMargin "Right Header:xx"
LabelString "Right Header:"
End
Style Received
- CopyStyle "Left Header"
+ CopyStyle Left_Header
LatexName received
LeftMargin Received:xx
LabelString Recieved:
End
Style Revised
- CopyStyle "Left Header"
+ CopyStyle Left_Header
LatexName revised
LeftMargin Revised:xx
LabelString Revised:
End
Style Accepted
- CopyStyle "Left Header"
+ CopyStyle Left_Header
LatexName accepted
LeftMargin Accepted:xx
LabelString Accepted:
End
Style CCC
- CopyStyle "Left Header"
+ CopyStyle Left_Header
LatexName ccc
LeftMargin "CCC code:xx"
LabelString "CCC code:"
@@ -138,21 +138,21 @@ End
# articleid
Style PaperId
- CopyStyle "Left Header"
+ CopyStyle Left_Header
LatexName paperid
LeftMargin "Paper Id:xx"
LabelString "Paper Id:"
End
Style AuthorAddr
- CopyStyle "Left Header"
+ CopyStyle Left_Header
LatexName authoraddr
LeftMargin "Author Address:xx"
LabelString "Author Address:"
End
Style SlugComment
- CopyStyle "Left Header"
+ CopyStyle Left_Header
LatexName slugcomment
LeftMargin "Slug Comment:xx"
LabelString "Slug Comment:"
@@ -195,7 +195,7 @@ End
# Table Caption style definition
-Style "Table Caption"
+Style Table_Caption
Margin First_Dynamic
LatexType Command
LatexName tablecaption
Index: lib/layouts/amsbook.layout
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/layouts/amsbook.layout,v
retrieving revision 1.4.2.1
diff -u -p -r1.4.2.1 amsbook.layout
--- lib/layouts/amsbook.layout 26 Apr 2005 15:24:57 -0000 1.4.2.1
+++ lib/layouts/amsbook.layout 27 Apr 2005 14:52:22 -0000
@@ -100,7 +100,7 @@ Input stdcounters.inc
# End-of Chapter exercises I need a way to do this.
# Chapter Exercises style definition
-Style "Chapter Exercises"
+Style Chapter_Exercises
Margin First_Dynamic
LatexType Item_Environment
LatexName lyxxcb
Index: lib/layouts/amsdefs.inc
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/layouts/amsdefs.inc,v
retrieving revision 1.2.18.1
diff -u -p -r1.2.18.1 amsdefs.inc
--- lib/layouts/amsdefs.inc 26 Apr 2005 15:24:57 -0000 1.2.18.1
+++ lib/layouts/amsdefs.inc 27 Apr 2005 14:52:22 -0000
@@ -183,7 +183,7 @@ Style Address
End
# Current Address style definition
-Style "Current Address"
+Style Current_Address
Margin Dynamic
LatexType Command
InTitle 1
Index: lib/layouts/broadway.layout
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/layouts/broadway.layout,v
retrieving revision 1.8.2.1
diff -u -p -r1.8.2.1 broadway.layout
--- lib/layouts/broadway.layout 26 Apr 2005 15:24:57 -0000 1.8.2.1
+++ lib/layouts/broadway.layout 27 Apr 2005 14:52:22 -0000
@@ -99,7 +99,7 @@ Style SCENE*
LabelString "SCENE "
End
-Style "AT RISE:"
+Style AT_RISE:
Margin Dynamic
LatexType Command
LatexName atrise
@@ -213,7 +213,7 @@ Style Author
End
# Right Address style
-Style "Right Address"
+Style Right_Address
Margin Right_Address_Box
LatexType Command
LatexName address
Index: lib/layouts/cv.layout
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/layouts/cv.layout,v
retrieving revision 1.6.2.2
diff -u -p -r1.6.2.2 cv.layout
--- lib/layouts/cv.layout 26 Apr 2005 15:24:57 -0000 1.6.2.2
+++ lib/layouts/cv.layout 27 Apr 2005 14:52:22 -0000
@@ -101,7 +101,7 @@ Style Itemize
End
# Left header
-Style "Left Header"
+Style Left_Header
CopyStyle Standard
LatexType Command
LatexName leftheader
@@ -120,8 +120,8 @@ Style "Left Header"
End
# Right header
-Style "Right Header"
- CopyStyle "Left Header"
+Style Right_Header
+ CopyStyle Left_Header
LatexName rightheader
Margin Right_Address_Box
End
Index: lib/layouts/dinbrief.layout
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/layouts/dinbrief.layout,v
retrieving revision 1.2.6.1
diff -u -p -r1.2.6.1 dinbrief.layout
--- lib/layouts/dinbrief.layout 26 Apr 2005 15:24:57 -0000 1.2.6.1
+++ lib/layouts/dinbrief.layout 27 Apr 2005 14:52:22 -0000
@@ -12,7 +12,7 @@ Input letter.layout
# Redefine some stuff
# My Address style
-Style "My Address"
+Style My_Address
Margin Static
LeftMargin Unterschr
LabelType Static
@@ -28,7 +28,7 @@ Style "My Address"
End
# Send To Adress style changes
-Style "Send To Address"
+Style Send_To_Address
Margin Static
BottomSep 0.1
LeftMargin Unterschr
Index: lib/layouts/egs.layout
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/layouts/egs.layout,v
retrieving revision 1.5.2.1
diff -u -p -r1.5.2.1 egs.layout
--- lib/layouts/egs.layout 26 Apr 2005 15:24:57 -0000 1.5.2.1
+++ lib/layouts/egs.layout 27 Apr 2005 14:52:22 -0000
@@ -258,7 +258,7 @@ Style Verse
End
# Right Address style
-Style "Right Address"
+Style Right_Address
Margin Right_Address_Box
LatexType Command
LatexName lyxrightaddress
@@ -309,7 +309,7 @@ End
# Title style definition
-Style "LaTeX Title"
+Style LaTeX_Title
Margin Static
LatexType Command
LatexName title
Index: lib/layouts/elsart.layout
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/layouts/elsart.layout,v
retrieving revision 1.1.2.5
diff -u -p -r1.1.2.5 elsart.layout
--- lib/layouts/elsart.layout 26 Apr 2005 15:24:57 -0000 1.1.2.5
+++ lib/layouts/elsart.layout 27 Apr 2005 14:52:22 -0000
@@ -133,7 +133,7 @@ Style Author
End
# Author Address
-Style "Author Address"
+Style Author_Address
Margin Static
LatexType Command
InTitle 1
@@ -148,7 +148,7 @@ Style "Author Address"
EndFont
End
-Style "Author Email"
+Style Author_Email
Margin Static
LatexType Command
InTitle 1
@@ -167,7 +167,7 @@ Style "Author Email"
EndFont
End
-Style "Author URL"
+Style Author_URL
Margin Static
LatexType Command
InTitle 1
Index: lib/layouts/foils.layout
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/layouts/foils.layout,v
retrieving revision 1.5.2.1
diff -u -p -r1.5.2.1 foils.layout
--- lib/layouts/foils.layout 26 Apr 2005 15:24:57 -0000 1.5.2.1
+++ lib/layouts/foils.layout 27 Apr 2005 14:52:22 -0000
@@ -170,7 +170,7 @@ Style Abstract
End
# Header definitions:
-Style "My Logo"
+Style My_Logo
Margin Static
LatexType Command
LatexName MyLogo
@@ -191,29 +191,29 @@ Style "My Logo"
End
Style Restriction
- CopyStyle "My Logo"
+ CopyStyle My_Logo
LatexName Restriction
LeftMargin Restriction:xx
LabelString "Restriction:"
End
-Style "Left Header"
- CopyStyle "My Logo"
+Style Left_Header
+ CopyStyle My_Logo
LatexName leftheader
LeftMargin Left_Header:xx
LabelString "Left Header:"
End
-Style "Right Header"
- CopyStyle "My Logo"
+Style Right_Header
+ CopyStyle My_Logo
LatexName rightheader
LeftMargin Right_Header:xx
LabelString "Right Header:"
End
-Style "Right Footer"
- CopyStyle "My Logo"
+Style Right_Footer
+ CopyStyle My_Logo
LatexName rightfooter
LeftMargin Right_Footer:xx
LabelString "Right Footer:"
Index: lib/layouts/heb-letter.layout
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/layouts/heb-letter.layout,v
retrieving revision 1.2.18.1
diff -u -p -r1.2.18.1 heb-letter.layout
--- lib/layouts/heb-letter.layout 26 Apr 2005 15:24:57 -0000 1.2.18.1
+++ lib/layouts/heb-letter.layout 27 Apr 2005 14:52:22 -0000
@@ -5,11 +5,11 @@
Input letter
-Style "My Address"
+Style My_Address
Align Left
End
-Style "Send To Address"
+Style Send_To_Address
Align Right
End
Index: lib/layouts/hollywood.layout
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/layouts/hollywood.layout,v
retrieving revision 1.11.2.1
diff -u -p -r1.11.2.1 hollywood.layout
--- lib/layouts/hollywood.layout 26 Apr 2005 15:24:57 -0000 1.11.2.1
+++ lib/layouts/hollywood.layout 27 Apr 2005 14:52:22 -0000
@@ -80,7 +80,7 @@ End
# FADE_IN: and FADE_OUT: usually stand alone. If you want a more complicated
# FADE_IN e.g. FADE_IN on STELLA:, use the Narrative Style.
-Style "FADE IN:"
+Style FADE_IN:
Margin Dynamic
LatexType Command
LatexName fadein
@@ -240,7 +240,7 @@ Style Transition
LabelType No_Label
End
-Style "TITLE OVER:"
+Style TITLE_OVER:
Margin Dynamic
LatexType Command
LatexName titleover
@@ -268,7 +268,7 @@ Style INTERCUT
LabelString "INTERCUT WITH: "
End
-Style "FADE OUT"
+Style FADE_OUT
Margin Dynamic
LatexType Command
LatexName fadeout
@@ -308,7 +308,7 @@ Style Scene
End
# Right Address style
-Style "Right Address"
+Style Right_Address
Margin Right_Address_Box
LatexType Command
LatexName address
@@ -350,7 +350,7 @@ End
Style Standard
ObsoletedBy General
End
-Style "FADE OUT:"
+Style FADE_OUT:
ObsoletedBy "FADE OUT"
End
Index: lib/layouts/llncs.layout
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/layouts/llncs.layout,v
retrieving revision 1.5.2.3
diff -u -p -r1.5.2.3 llncs.layout
--- lib/layouts/llncs.layout 26 Apr 2005 15:24:57 -0000 1.5.2.3
+++ lib/layouts/llncs.layout 27 Apr 2005 14:52:22 -0000
@@ -155,7 +155,7 @@ Style Subtitle
End
# Title_Running style definition
-Style "Running LaTeX Title"
+Style Running_LaTeX_Title
Margin Static
InTitle 1
LatexType Command
@@ -182,8 +182,8 @@ Style "Running LaTeX Title"
End
# TOC_Title style definition
-Style "TOC Title"
- CopyStyle "Running LaTeX Title"
+Style TOC_Title
+ CopyStyle Running_LaTeX_Title
LatexName toctitle
LeftMargin "TOC title:xxx"
LabelString "TOC title: "
@@ -214,16 +214,16 @@ Style Author
End
# AuthorRunning style definition
-Style "Author Running"
- CopyStyle "Running LaTeX Title"
+Style Author_Running
+ CopyStyle Running LaTeX_Title
LatexName authorrunning
LeftMargin "Author Running:xxx"
LabelString "Author Running: "
End
# TOC_Author style definition
-Style "TOC Author"
- CopyStyle "Running LaTeX Title"
+Style TOC_Author
+ CopyStyle Running_LaTeX_Title
LatexName tocauthor
LeftMargin "TOC Author:xxx"
LabelString "TOC Author: "
@@ -255,7 +255,7 @@ End
#
# Correspondence address style definition
Style Email
- CopyStyle "Running LaTeX Title"
+ CopyStyle Running_LaTeX_Title
LatexName email
LeftMargin "Email:xxx"
LabelString "Email: "
Index: lib/layouts/lyxmacros.inc
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/layouts/lyxmacros.inc,v
retrieving revision 1.4.2.1
diff -u -p -r1.4.2.1 lyxmacros.inc
--- lib/layouts/lyxmacros.inc 26 Apr 2005 15:24:57 -0000 1.4.2.1
+++ lib/layouts/lyxmacros.inc 27 Apr 2005 14:52:22 -0000
@@ -98,7 +98,7 @@ Style Address
End
# Right Address style
-Style "Right Address"
+Style Right_Address
Margin Right_Address_Box
LatexType Command
LatexName lyxrightaddress
Index: lib/layouts/obsolete.inc
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/layouts/obsolete.inc,v
retrieving revision 1.2.6.1
diff -u -p -r1.2.6.1 obsolete.inc
--- lib/layouts/obsolete.inc 26 Apr 2005 15:24:57 -0000 1.2.6.1
+++ lib/layouts/obsolete.inc 27 Apr 2005 14:52:22 -0000
@@ -7,7 +7,7 @@
# historical reasons
# Title style definition
-Style "LaTeX Title"
+Style LaTeX_Title
ObsoletedBy Title
End
Index: lib/layouts/revtex.layout
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/layouts/revtex.layout,v
retrieving revision 1.3.2.1
diff -u -p -r1.3.2.1 revtex.layout
--- lib/layouts/revtex.layout 26 Apr 2005 15:24:57 -0000 1.3.2.1
+++ lib/layouts/revtex.layout 27 Apr 2005 14:52:22 -0000
@@ -172,6 +172,6 @@ Input stdcounters.inc
### Finally a few obsolete definitions for compatibility
Input obsolete.inc
-Style "REVTEX Title"
+Style REVTEX_Title
ObsoletedBy Title
End
Index: lib/layouts/revtex4.layout
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/layouts/revtex4.layout,v
retrieving revision 1.6.2.2
diff -u -p -r1.6.2.2 revtex4.layout
--- lib/layouts/revtex4.layout 26 Apr 2005 15:24:57 -0000 1.6.2.2
+++ lib/layouts/revtex4.layout 27 Apr 2005 14:52:22 -0000
@@ -181,7 +181,7 @@ Style Thanks
LabelString "Thanks: "
End
-Style "Author Email"
+Style Author_Email
CopyStyle Affiliation
PassThru 1
LatexName email
@@ -196,8 +196,8 @@ Style "Author Email"
EndFont
End
-Style "Author URL"
- CopyStyle "Author Email"
+Style Author_URL
+ CopyStyle Author_Email
PassThru 1
LatexName homepage
LabelString "URL: "
@@ -255,6 +255,6 @@ Input stdcounters.inc
### Finally a few obsolete definitions for compatibility
Input obsolete.inc
-Style "REVTEX Title"
+Style REVTEX_Title
ObsoletedBy Title
End
Index: lib/layouts/slides.layout
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/layouts/slides.layout,v
retrieving revision 1.2.2.1
diff -u -p -r1.2.2.1 slides.layout
--- lib/layouts/slides.layout 26 Apr 2005 15:24:57 -0000 1.2.2.1
+++ lib/layouts/slides.layout 27 Apr 2005 14:52:22 -0000
@@ -292,7 +292,7 @@ Input stdfloats.inc
#Input obsolete.inc
# Style definition for end of a slide
-Style "End All Slides"
+Style End_All_Slides
ObsoletedBy Comment
End
Index: lib/layouts/stdletter.inc
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/layouts/stdletter.inc,v
retrieving revision 1.3.6.1
diff -u -p -r1.3.6.1 stdletter.inc
--- lib/layouts/stdletter.inc 26 Apr 2005 15:24:57 -0000 1.3.6.1
+++ lib/layouts/stdletter.inc 27 Apr 2005 14:52:22 -0000
@@ -30,7 +30,7 @@ Style Standard
End
# My Address style
-Style "My Address"
+Style My_Address
Margin Right_Address_Box
LatexType Command
LatexName address
@@ -42,7 +42,7 @@ Style "My Address"
End
# Send_To_Address style definition
-Style "Send To Address"
+Style Send_To_Address
Margin Static
LatexType Command
LatexName letter
Index: lib/layouts/svjour.inc
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/layouts/svjour.inc,v
retrieving revision 1.3.6.2
diff -u -p -r1.3.6.2 svjour.inc
--- lib/layouts/svjour.inc 26 Apr 2005 15:24:57 -0000 1.3.6.2
+++ lib/layouts/svjour.inc 27 Apr 2005 14:52:22 -0000
@@ -189,7 +189,7 @@ Style Subtitle
End
# Title_Running style definition
-Style "Running LaTeX Title"
+Style Running_LaTeX_Title
CopyStyle Headnote
LatexName titlerunning
LeftMargin "Running title:xxx"
@@ -221,7 +221,7 @@ Style Author
End
# AuthorRunning style definition
-Style "Author Running"
+Style Author_Running
CopyStyle Headnote
LatexName authorrunning
LeftMargin "Author Running:xxx"
