X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flyxrc.example;h=c9bab7030230373db93ee7758cd174024c00b304;hb=12d02d04b2b26bdd49ca8dfcc0c53529c8a20f9d;hp=0306a3459ab17add6d9b51f68145e06a1cc1ee99;hpb=29f7055e9527314060b4a74c31a46155ff264a63;p=lyx.git

diff --git a/lib/lyxrc.example b/lib/lyxrc.example
index 0306a3459a..c9bab70302 100644
--- a/lib/lyxrc.example
+++ b/lib/lyxrc.example
@@ -156,6 +156,14 @@
 #
 #\date_insert_format "%A, %e. %B %Y"
 
+
+# Maximum number of words in the initialization string for a new label.
+# If it is set to 0, then the init. string will only contain the prefix
+# (e.g. "sec:"). If it is set to -1, the init. string will be empty. 
+# This feature is disabled in 1.1.6.
+#
+#\label_init_length 0
+
 #
 # SCREEN & FONTS SECTION #################################################
 #
@@ -202,20 +210,20 @@
 # the same as what LaTeX calls latin1.
 #\screen_font_encoding iso8859-2
 
-# The norm for the menu/popups fonts. The default is an empty string, which
+# The norm for the popup fonts. The default is an empty string, which
 # causes to use the screen fonts norm (defined by \screen_font_encoding).
-#\screen_font_encoding_menu iso8859-2
+#\popup_font_encoding iso8859-2
 
 
-# The font for popups. It is set to 
+# The normal font for popups. It is set to 
 #    <font_popup>-*-*-*-?-*-*-*-*-<font_encoding>.
 # The default  is:
-#\screen_font_popup "-*-helvetica-medium-r"
+#\popup_font_name "-*-helvetica-medium-r"
 
-# The font for menus (and groups titles in popups). It is set to 
+# The bold font for popups. It is set to 
 #    <font_menu>-*-*-*-?-*-*-*-*-<font_encoding>.
 # The default  is:
-#\screen_font_menu "-*-helvetica-bold-r"
+#\popup_bold_font "-*-helvetica-bold-r"
 
 # The font sizes used for calculating the scaling of the screen fonts.
 # You should only have to change these if the fonts on your screen look bad,
@@ -340,13 +348,12 @@
 # The converter command has 4 arguments: The source format, the target format,
 # the command, and additional flags.
 # For example, the following defines a DVI->Postscript converter:
-#\converter dvi ps "dvips -o $$OutName $$FName" ""
-# The variable name $$FName is replaced with the name of the source file,
-# and $$OutName is replaced with the name of the target file.
+#\converter dvi ps "dvips -o $$o $$i" ""
+# The variable name $$i is replaced with the name of the source file,
+# and $$o is replaced with the name of the target file.
 # The flags argument is a list of comma separated flags.
 # Known flags are
 # - * : copy the previously defined flags
-# - importer : The converter is used for importing.
 # - latex : The converter is latex or its derivatives (pdflatex).
 # - originaldir : The converter must be invoked in the directory of the lyx
 #   file and not in the temporary directory. This is needed for tex->html
@@ -354,26 +361,24 @@
 # - needaux : The converted uses the .aux file, so we need to call latex
 #   before running the converter.
 # - resultdir=dir : The converter put all the files in dir.
-#   Using "resultdir" is same as "resultdir=$$Basename".
+#   Using "resultdir" is same as "resultdir=$$b".
 #   Note: When exporting, the whole directory will be moved from the temporary
 #   directory to the target directory.
 # - resultfile=file : Name of main file in the result directory, for example
-#  "index.html" or "$$BaseName.html"
+#  "index.html" or "$$b.html"
 #   If "resultfile" is omitted, the name of this file is assumed to be
 #   "index.format"
 # - parselog=filtername : filtername is a name of a filter command that takes
 #   the converter error log (from stderr), and converts it to a fake latex .log
 #   file.
-#  - disable=backends : A list of & seperated backend in which the converter
-#   should not be used.
 # For example:
-#\converter latex html "latex2html -split 0 $$FName"
-#           "originaldir,needaux,resultdir,disable=linuxdoc&docbook"
+#\converter latex html "latex2html -split 0 $$i"
+#           "originaldir,needaux,resultdir"
 #
 # For literate programming, use something like
-#\converter literate latex "noweave -delay -index $$FName >$$OutName"
+#\converter literate latex "noweave -delay -index $$i >$$o"
 #                          "parselog=listerrors g"
-#\converter literate program "build-script $$FName"
+#\converter literate program "build-script $$i"
 #                            "originaldir,parselog=listerrors g"
 
 # The format command is used to define file formats. It has 4 arguments:
@@ -459,28 +464,6 @@
 # Default is "".
 #\backupdir_path "~/Desktop/Trash/"
 
-
-#
-# FAX SECTION #############################################################
-#
-
-# In the following, the <$$something> strings are substituted by
-# reasonable values by LyX. The 's are important as there may be spaces in 
-# the string. The default is auto-detected.
-# This one is what is used with HylaFax:
-#\fax_command "sendfax -n -h '$$Host' -c '$$Comment' -x '$$Enterprise' -d '$$Name'@'$$Phone' '$$FName'"
-# Use this for the efax-command:
-#\fax_command "faxsend '$$Phone' '$$FName'"
-
-# This is the name of your phone book. It's per default situated in ~/.lyx/,
-# but you can override that with an absolute path.
-#\phone_book phonebook
-
-# This is how to call an external FAX-program instead of the built-in.
-# You may also insert $$FName to reference the PostScript file.
-#\fax_program "myfaxprg '$$FName'"
-#\fax_program tkhylafax
-
 #
 # ASCII EXPORT SECTION ###################################################
 #