Subject: Patch submitted: cleanup of style menu entries
From: Bryce Nesbitt (bryce@obviously.com)
Date: Tue Dec 18 2001 - 09:11:46 CST
The AbiWord style menu has been getting a bit cluttered & confusing recently. The main
culprit is the naming: related items are scattered through the menu.
I also feel there are also too many entries. There is no need (and indeed no way) to mirror
every AbiWord feature as a style. There's no need for twelve types of lists, for example.
The defualt styles should be like the toolbar -- presenting the most common
options, and giving a template for a person to build their own specific set.
This patch cleans up the menu, and sorts related items. The flow and inheritence of
the styles has been regularized. If applied in this form, this path will require matching
changes on the part of the translators.
The menu as proposed looks like this (suggestions on naming welcome):
Heading
Heading-2
Heading-3
Heading-Chapter
Heading-Section
List-Bullet
List-Numbered
Normal
Normal-Align-Center
Normal-Align-Right
Normal-Align-Left
Normal-Bold
Normal-Italic
Normal-Underline
Please compare it to the current version.
-Bryce
Index: src/text/ptbl/xp/pt_PT_Styles.cpp
===================================================================
RCS file: /cvsroot/abi/src/text/ptbl/xp/pt_PT_Styles.cpp,v
retrieving revision 1.65
diff -u -r1.65 pt_PT_Styles.cpp
--- src/text/ptbl/xp/pt_PT_Styles.cpp 2001/12/11 21:15:26 1.65
+++ src/text/ptbl/xp/pt_PT_Styles.cpp 2001/12/18 15:10:57
@@ -56,6 +56,7 @@
char* list_fmt = " list-style:%s; start-value:%s; margin-left:%fin; text-indent:-%fin; field-color:%s;list-delim:%s; field-font:%s; list-decimal:%s";
char list_fmt_tmp[1024];
+
#ifdef BIDI_ENABLED
#ifdef BIDI_RTL_DOMINANT
_s("Normal", "P", "", "Current Settings", "font-family:Times New Roman; font-size:12pt; font-weight:normal; font-style:normal; font-stretch:normal; font-variant:normal; dom-dir:rtl; text-align:right; margin-top:0pt; margin-bottom:0pt; margin-left:0pt; margin-right:0pt; text-decoration:none; text-indent:0in; text-position:normal; line-height:1.0; color:000000; bgcolor:transparent; widows:2; field-font:NULL");
@@ -65,86 +66,36 @@
#else
_s("Normal", "P", "", "Current Settings", "font-family:Times New Roman; font-size:12pt; font-weight:normal; font-style:normal; font-stretch:normal; font-variant:normal; margin-top:0pt; margin-bottom:0pt; margin-left:0pt; margin-right:0pt; text-decoration:none; text-indent:0in; text-position:normal; text-align:left; line-height:1.0; color:000000; bgcolor:transparent; widows:2; field-font:NULL");
#endif
- _s("Normal Clean", "P", "Normal", "Current Settings", "font-weight:normal; font-style:normal; margin-top:0pt; text-align:left; line-height:1.0; field-font:NULL");
-
- _s("Heading 1", "P", "Normal", "Normal", "font-family:Arial; font-size:17pt; font-weight:bold; margin-top:22pt; margin-bottom:3pt; keep-with-next:1; field-font:NULL");
- _s("Heading 2", "P", "Normal", "Normal", "font-family:Arial; font-size:14pt; font-weight:bold; margin-top:22pt; margin-bottom:3pt; keep-with-next:1; field-font:NULL");
- _s("Heading 3", "P", "Normal", "Normal", "font-family:Arial; font-size:12pt; font-weight:bold; margin-top:22pt; margin-bottom:3pt; keep-with-next:1; field-font:NULL");
- _s("Plain Text","P", "Normal", "Current Settings", "font-family:Courier New; field-font:NULL");
- _s("Block Text","P", "Normal", "Current Settings", "margin-left:1in; margin-right:1in; margin-bottom:6pt; field-font:NULL");
-
- sprintf(list_fmt_tmp, list_fmt, "Numbered List", "1",LIST_DEFAULT_INDENT, LIST_DEFAULT_INDENT_LABEL, "transparent", "%L.", "NULL", ".");
- _s("Numbered List","P", "", "Current Settings", list_fmt_tmp);
-
- sprintf(list_fmt_tmp, list_fmt, "Lower Case List","1", LIST_DEFAULT_INDENT, LIST_DEFAULT_INDENT_LABEL, "transparent", "%L)", "NULL", ".");
- _s("Lower Case List","P", "Numbered List", "Current Settings", list_fmt_tmp);
- sprintf(list_fmt_tmp, list_fmt, "Upper Case List","1", LIST_DEFAULT_INDENT, LIST_DEFAULT_INDENT_LABEL, "transparent", "%L)", "NULL", ".");
- _s("Upper Case List","P", "Numbered List", "Current Settings", list_fmt_tmp);
-
- sprintf(list_fmt_tmp, list_fmt, "Lower Roman List","1", LIST_DEFAULT_INDENT, LIST_DEFAULT_INDENT_LABEL, "transparent", "%L", "NULL", ".");
- _s("Lower Roman List","P", "Normal", "Current Settings", list_fmt_tmp);
-
- sprintf(list_fmt_tmp, list_fmt,"Upper Roman List","1", LIST_DEFAULT_INDENT, LIST_DEFAULT_INDENT_LABEL, "transparent", "%L", "NULL", ".");
- _s("Upper Roman List","P", "Numbered List", "Current Settings", list_fmt_tmp);
-
- sprintf(list_fmt_tmp, list_fmt, "Bullet List","0", LIST_DEFAULT_INDENT, LIST_DEFAULT_INDENT_LABEL, "transparent", "%L", "Symbol", "NULL");
-
- _s("Bullet List", "P", "", "Current Settings", list_fmt_tmp);
- sprintf(list_fmt_tmp, list_fmt, "Implies List","0", LIST_DEFAULT_INDENT, LIST_DEFAULT_INDENT_LABEL, "transparent", "%L", "Symbol", "NULL");
- _s("Implies List", "P", "", "Current Settings", list_fmt_tmp);
-
- sprintf(list_fmt_tmp, list_fmt, "Dashed List","0", LIST_DEFAULT_INDENT, LIST_DEFAULT_INDENT_LABEL, "transparent", "%L", "NULL", "NULL");
- _s("Dashed List", "P", "", "Current Settings", list_fmt_tmp);
-
- sprintf(list_fmt_tmp, list_fmt, "Square List","0", LIST_DEFAULT_INDENT, LIST_DEFAULT_INDENT_LABEL, "transparent", "%L", "Dingbats", "NULL");
- _s("Square List", "P", "", "Current Settings", list_fmt_tmp);
-
- sprintf(list_fmt_tmp, list_fmt, "Triangle List","0", LIST_DEFAULT_INDENT, LIST_DEFAULT_INDENT_LABEL, "transparent", "%L", "Dingbats", "NULL");
- _s("Triangle List", "P", "", "Current Settings", list_fmt_tmp);
-
- sprintf(list_fmt_tmp, list_fmt, "Diamond List","0", LIST_DEFAULT_INDENT, LIST_DEFAULT_INDENT_LABEL, "transparent", "%L", "Dingbats", "NULL");
- _s("Diamond List", "P", "", "Current Settings", list_fmt_tmp);
-
- sprintf(list_fmt_tmp, list_fmt, "Star List","0", LIST_DEFAULT_INDENT, LIST_DEFAULT_INDENT_LABEL, "transparent", "%L", "Dingbats", "NULL");
- _s("Star List", "P", "", "Current Settings", list_fmt_tmp);
-
- sprintf(list_fmt_tmp, list_fmt, "Tick List","0", LIST_DEFAULT_INDENT, LIST_DEFAULT_INDENT_LABEL, "transparent", "%L", "Dingbats", "NULL");
- _s("Tick List", "P", "", "Current Settings", list_fmt_tmp);
+ _s("Normal-Align-Left", "P", "Normal", "Current Settings", "text-align:left");
+ _s("Normal-Align-Right", "P", "Normal", "Current Settings", "text-align:right");
+ _s("Normal-Align-Center", "P", "Normal", "Current Settings", "text-align:center");
+ _s("Normal-Bold", "C", "Normal", "Current Settings", "font-weight:bold");
+ _s("Normal-Italic", "C", "Normal", "Current Settings", "font-style:italic");
+ _s("Normal-Underline", "C", "Normal", "Current Settings", "text-decoration:underline");
+ _s("Normal-Typewriter", "C", "Normal", "Current Settings", "font-family:Courier New");
+
+ sprintf(list_fmt_tmp, list_fmt, "Numbered List", "1",LIST_DEFAULT_INDENT, LIST_DEFAULT_INDENT_LABEL, "transparent", "%L.", "NULL", ".");
+ _s("List-Numbered","P", "", "Current Settings", list_fmt_tmp);
+ sprintf(list_fmt_tmp, list_fmt, "Bullet List", "0",LIST_DEFAULT_INDENT, LIST_DEFAULT_INDENT_LABEL, "transparent", "%L", "Symbol", "NULL");
+ _s("List-Bullet", "P", "", "Current Settings", list_fmt_tmp);
+
+ _s("Heading", "P", "", "Normal", "font-family:Arial; font-size:17pt; font-weight:bold; margin-top:22pt; margin-bottom:3pt; keep-with-next:1; field-font:NULL");
+ _s("Heading-2", "P", "Heading", "Normal", "font-size:14pt");
+ _s("Heading-3", "P", "Heading", "Normal", "font-size:12pt");
+ _s("Heading-Chapter", "P", "Heading", "Normal", "tabstops:1.1in/L0; list-style:Numbered List; start-value:1; margin-left:0.0in; text-indent:0.0in; field-color:transparent; list-delim:Chapter %L; field-font:Arial; list-decimal: ");
+ _s("Heading-Section", "P", "Heading", "Normal", "tabstops:1.1in/L0; list-style:Numbered List; start-value:1; margin-left:0.0in; text-indent:0.0in; field-color:transparent; list-delim:Section %L; field-font:Arial; list-decimal: ");
- sprintf(list_fmt_tmp, list_fmt, "Box List","0", LIST_DEFAULT_INDENT, LIST_DEFAULT_INDENT_LABEL, "transparent", "%L", "Dingbats", "NULL");
- _s("Box List", "P", "", "Current Settings", list_fmt_tmp);
-
- sprintf(list_fmt_tmp, list_fmt, "Hand List","0", LIST_DEFAULT_INDENT, LIST_DEFAULT_INDENT_LABEL, "transparent", "%L", "Dingbats", "NULL");
- _s("Hand List", "P", "", "Current Settings", list_fmt_tmp);
-
- sprintf(list_fmt_tmp, list_fmt, "Heart List","0", LIST_DEFAULT_INDENT, LIST_DEFAULT_INDENT_LABEL, "transparent", "%L", "Dingbats", "NULL");
- _s("Heart List", "P", "", "Current Settings", list_fmt_tmp);
-
- _s("Numbered Heading 1","P","Heading 1","Normal","tabstops:0.3in/L0; list-style:Numbered List; start-value:1; margin-left:0.0in; text-indent:0.0in; field-color:transparent; list-delim:%L; field-font:Arial; list-decimal:. ");
-
- _s("Numbered Heading 2","P","Heading 2","Normal","tabstops:0.3in/L0; list-style:Numbered List; start-value:1; margin-left:0.0in; text-indent:0.0in; field-color:transparent; list-delim:%L; field-font:Arial; list-decimal:. ");
-
- _s("Numbered Heading 3","P","Heading 3","Normal","tabstops:0.3in/L0; list-style:Numbered List; start-value:1; margin-left:0.0in; text-indent:0.0in; field-color:transparent; list-delim:%L; field-font:Arial; list-decimal:. ");
-
- _s("Chapter Heading 1","P","Numbered Heading 1","Normal","tabstops:1.1in/L0; list-style:Numbered List; start-value:1; margin-left:0.0in; text-indent:0.0in; field-color:transparent; list-delim:Chapter %L; field-font:Arial; list-decimal: ");
-
- _s("Chapter Heading 2","P","Numbered Heading 2","Normal","tabstops:0.93in/L0; list-style:Numbered List; start-value:1; margin-left:0.0in; text-indent:0.0in; field-color:transparent; list-delim:Chapter %L; field-font:Arial; list-decimal: ");
-
- _s("Chapter Heading 3","P","Numbered Heading 3","Normal","tabstops:0.8in/L0; list-style:Numbered List; start-value:1; margin-left:0.0in; text-indent:0.0in; field-color:transparent; list-delim:Chapter %L; field-font:Arial; list-decimal: ");
-
- _s("Section Heading 1","P","Numbered Heading 1","Normal","tabstops:1.1in/L0; list-style:Numbered List; start-value:1; margin-left:0.0in; text-indent:0.0in; field-color:transparent; list-delim:Section %L; field-font:Arial; list-decimal: ");
-
- _s("Section Heading 2","P","Numbered Heading 2","Normal","tabstops:0.9in/L0; list-style:Numbered List; start-value:1; margin-left:0.0in; text-indent:0.0in; field-color:transparent; list-delim:Section %L; field-font:Arial; list-decimal: ");
-
- _s("Section Heading 3","P","Numbered Heading 3","Normal","tabstops:0.8in/L0; list-style:Numbered List; start-value:1; margin-left:0.0in; text-indent:0.0in; field-color:transparent; list-delim:Section %L; field-font:Arial; list-decimal: ");
+#if 0
+ _s("Clean", "P", "Normal", "Current Settings", "font-weight:normal; font-style:normal; margin-top:0pt; text-align:left; line-height:1.0; field-font:NULL");
+ _s("Block Text", "P", "Normal", "Current Settings", "margin-left:1in; margin-right:1in; margin-bottom:6pt; field-font:NULL");
- _s("Endnote Reference","C", "None", "Current Settings", "text-position:superscript; font-size:10pt");
- _s("Endnote Text","P", "Normal", "Current Settings", "text-position:normal");
+ _s("Reference-Endnote", "C", "None", "Current Settings", "text-position:superscript; font-size:10pt");
+ _s("Reference-Endnote Text", "P", "Normal", "Current Settings", "text-position:normal");
-#if 0
- _s("Footnote Reference","C", "None", "Current Settings", "text-position:superscript; font-size:10pt");
- _s("Footnote Text","P", "Normal", "Current Settings", "text-position:normal");
+ _s("Reference-Footnote", "C", "None", "Current Settings", "text-position:superscript; font-size:10pt");
+ _s("Reference-Footnote Text","P", "Normal", "Current Settings", "text-position:normal");
#endif
+
setlocale (LC_NUMERIC, "");
return true;
This archive was generated by hypermail 2b25 : Tue Dec 18 2001 - 09:13:46 CST