Re: [patch] ditch date-insert
Jürgen Spitzmüller wrote: > The attached patch strips date-insert (and the related rc entry and > helper functions) from master. The function is obsoleted by the more > flexible and powerful date info-insets. > > Objections? Good move. Pavel
Re: [LyX/master] Update info-insert documentation
Jürgen Spitzmüller wrote: > Am Freitag, den 17.08.2018, 20:31 +0200 schrieb Jürgen Spitzmüller: > > > - Insert menu now contains field submenu. Perhaps we could add > > > revision info menu entry in case VCS is used? Or we could put it > > > into > > > File Version Control, no strong opinion. > > > > I'll have a look. > > Done (the former). All works fine now, thanks. Pavel
Re: Problem outputing usepakage for fonts
Am Freitag, den 17.08.2018, 21:20 +0200 schrieb Kornel Benko:
> ...
> This looks all OK, but when looking int the outed latex-preamble:
> ...
> \documentclass[english]{article}
> \usepackage{DejaVuSerif}
> \usepackage[extralight,scale=0.8]{plex-sans}
> \usepackage[semibold,scale=0.7]{plex-mono}
> \usepackage[textmd]{plex-mono}
> \usepackage[T1]{fontenc}
> \usepackage[latin9]{inputenc}
> \usepackage{babel}
> ...
>
> This is unfortunately creating option clash, because the math-font
> shares the same package as the mono font (though with different
> option)
>
> Combined \usepackage[semibold,scale=0.70,textmd]{plex-mono} would
> work.
> The reversion lyx2lyx routine takes care of it, but 'lyx2.4-export
> latex' does not.
Are you sure there are dedicated math fonts included? I understand that
"semibold" and "textmd" are both (text) font weights.
Jürgen
>
> Kornel
signature.asc
Description: This is a digitally signed message part
Re: [LyX/master] Update info-insert documentation
Am Freitag, den 17.08.2018, 20:31 +0200 schrieb Jürgen Spitzmüller: > > - Insert menu now contains field submenu. Perhaps we could add > > revision info menu entry in case VCS is used? Or we could put it > > into > > File Version Control, no strong opinion. > > I'll have a look. Done (the former). Jürgen signature.asc Description: This is a digitally signed message part
Re: [LyX/master] Added IBM Plex fonts to lyx-GUI
Am Samstag, den 18.08.2018, 16:26 +0200 schrieb Kornel Benko: > commit 24050bfa30095284c0835dd2d602824df9d3f5ff > Author: Kornel Benko > Date: Sat Aug 18 16:18:03 2018 +0200 I get now Warning: An error ocurred in 561, Traceback (most recent call last): File "/home/juergen/lyx/lyx-devel/lib/lyx2lyx/lyx2lyx", line 96, in main() File "/home/juergen/lyx/lyx-devel/lib/lyx2lyx/lyx2lyx", line 90, in main doc.convert() File "/home/juergen/lyx/lyx-devel/lib/lyx2lyx/LyX.py", line 692, in convert conv(self) File "/home/juergen/lyx/lyx-devel/lib/lyx2lyx/lyx_2_4.py", line 255, in convert_dejavu convert_fonts(document, dejavu_fonts_roman, "\\font_roman", None, None) File "/home/juergen/lyx/lyx-devel/lib/lyx2lyx/lyx_2_4.py", line 102, in convert_fonts pkgkey = createkey(fe.package, fe.options) File "/home/juergen/lyx/lyx-devel/lib/lyx2lyx/lyx_2_4.py", line 63, in createkey sort(options) NameError: global name 'sort' is not defined Jürgen signature.asc Description: This is a digitally signed message part
[patch] ditch date-insert
The attached patch strips date-insert (and the related rc entry and
helper functions) from master. The function is obsoleted by the more
flexible and powerful date info-insets.
Objections?
Jürgen
diff --git a/lib/RELEASE-NOTES b/lib/RELEASE-NOTES
index 2a1157eea5..9fa91e3c88 100644
--- a/lib/RELEASE-NOTES
+++ b/lib/RELEASE-NOTES
@@ -29,6 +29,10 @@
* \use_qimage
This is no longer necessary due to the rewrite of the painter.
+* \date_insert_format
+ The function date-insert has been removed and superseded by info-insert date.
+ The latter does not need a pref value anymore.
+
!!!The following new LyX functions have been introduced in 2.4:
@@ -42,6 +46,11 @@
* info-insert buffer vcs-*: renamed to info-insert vcs *
+!!!The following LyX functions have been removed in 2.4:
+
+* date-insert: obsoleted by info-insert date.
+
+
!!!The following LyX documents have been moved in 2.4:
diff --git a/lib/scripts/prefs2prefs_lfuns.py b/lib/scripts/prefs2prefs_lfuns.py
index 2ffb7f1d74..ec65f97925 100644
--- a/lib/scripts/prefs2prefs_lfuns.py
+++ b/lib/scripts/prefs2prefs_lfuns.py
@@ -217,6 +217,10 @@ def info_rename_vcstreerevision(line):
return simple_renaming(line, "info-insert buffer vcs-tree-revision", "info-insert vcs tree-revision")
+def remove_date_insert(line):
+ return simple_remove(line, "date-insert")
+
+
#
###
@@ -253,6 +257,7 @@ conversions = [
info_rename_vcsdate,
info_rename_vcstime,
info_rename_vcsrevision,
- info_rename_vcstreerevision
+ info_rename_vcstreerevision,
+ remove_date_insert
]]
]
diff --git a/lib/scripts/prefs2prefs_prefs.py b/lib/scripts/prefs2prefs_prefs.py
index 8ea20723ab..5e7c0bf627 100644
--- a/lib/scripts/prefs2prefs_prefs.py
+++ b/lib/scripts/prefs2prefs_prefs.py
@@ -111,6 +111,9 @@
# Incremented to format 27, by spitz
# Add optional flavor value to needaux flag
+# Incremented to format 28, by spitz
+# Remove date_insert_format
+
# NOTE: The format should also be updated in LYXRC.cpp and
# in configure.py.
@@ -405,6 +408,11 @@ def remove_font_encoding(line):
return no_match
return (True, "")
+def remove_date_insert_format(line):
+ if not line.lower().startswith("\\date_insert_format "):
+ return no_match
+ return (True, "")
+
# End conversions for LyX 2.3 to 2.4
@@ -446,5 +454,6 @@ conversions = [
[ 24, [rename_collapsible]],
[ 25, [remove_use_qimage]],
[ 26, [remove_font_encoding]],
- [ 27, []]
+ [ 27, []],
+ [ 28, [remove_date_insert_format]]
]
diff --git a/src/FuncCode.h b/src/FuncCode.h
index 7b8fedc435..3798786018 100644
--- a/src/FuncCode.h
+++ b/src/FuncCode.h
@@ -241,7 +241,7 @@ enum FuncCode
LFUN_PREFERENCES_SAVE,
LFUN_HELP_OPEN, // Jug 990627
// 175
- LFUN_DATE_INSERT, // jdblair 2131
+ LFUN_LAYOUT_TOGGLE, // lasgouttes 20180514
LFUN_LANGUAGE, // Dekel 2203
LFUN_ERT_INSERT,// Jug 2218
LFUN_FOOTNOTE_INSERT, // Jug 2307
@@ -479,9 +479,8 @@ enum FuncCode
LFUN_BUFFER_ANONYMIZE, // sanda, 20180201
LFUN_GRAPHICS_UNIFY,// sanda, 20180207
LFUN_MASTER_BUFFER_EXPORT, // rkh, 20180417
- LFUN_LAYOUT_TOGGLE, // lasgouttes 20180514
- // 375
LFUN_INSET_END_EDIT,// gb/rkh, 20180605
+ // 375
LFUN_LASTACTION // end of the table
};
diff --git a/src/LyXAction.cpp b/src/LyXAction.cpp
index 4f424883f7..43f4e80a99 100644
--- a/src/LyXAction.cpp
+++ b/src/LyXAction.cpp
@@ -1365,19 +1365,6 @@ void LyXAction::init()
*/
{ LFUN_CUT, "cut", Noop, Edit },
-/*!
- * \var lyx::FuncCode lyx::LFUN_DATE_INSERT
- * \li Action: Inserts the current date.
- * \li Syntax: date-insert []
- * \li Params: : Format of date. The default value (%x) can be set
- in Preferences->Output->General->Date format. For
- possible formats see the manual page of the
- strftime function.
- * \li Origin: jdblair, 31 Jan 2000
- * \endvar
- */
- { LFUN_DATE_INSERT, "date-insert", Noop, Edit },
-
/*!
* \var lyx::FuncCode lyx::LFUN_DEBUG_LEVEL_SET
* \li Action: Set debug output level.
diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp
index 5e8d38c798..d11181fcc5 100644
--- a/src/LyXRC.cpp
+++ b/src/LyXRC.cpp
@@ -59,7 +59,7 @@ namespace {
// The format should also be updated in configure.py, and conversion code
// should be added to prefs2prefs_prefs.py.
-static unsigned int const LYXRC_FILEFORMAT = 27; // spitz: add flavor value to needaux flag
+static unsigned int const LYXRC_FILEFORMAT = 28; // spitz: remove \\date_insert_format
// when adding something to this array keep it sorted!
LexerKeyword lyxrcTags[] = {
{ "\\accept_compound", LyXRC::RC_ACCEPT_COMPOUND },
@@ -92,7 +92,6 @@ LexerKeyword lyxrcTags[] = {
{ "\\copier", LyXRC::RC_COPIER },
{ "\\cursor_follows_scrollbar",
Re: [LyX/master] Added IBM Plex fonts to lyx-GUI
Am Samstag, 18. August 2018 16:45:22 CEST schrieb Jürgen Spitzmüller : > Am Samstag, den 18.08.2018, 16:26 +0200 schrieb Kornel Benko: > > commit 24050bfa30095284c0835dd2d602824df9d3f5ff > > Author: Kornel Benko > > Date: Sat Aug 18 16:18:03 2018 +0200 > > I get now > > Warning: An error ocurred in 561, 0x7f3a728a50c8> > Traceback (most recent call last): > File "/home/juergen/lyx/lyx-devel/lib/lyx2lyx/lyx2lyx", line 96, in > > main() > File "/home/juergen/lyx/lyx-devel/lib/lyx2lyx/lyx2lyx", line 90, in > main > doc.convert() > File "/home/juergen/lyx/lyx-devel/lib/lyx2lyx/LyX.py", line 692, in > convert > conv(self) > File "/home/juergen/lyx/lyx-devel/lib/lyx2lyx/lyx_2_4.py", line 255, > in convert_dejavu > convert_fonts(document, dejavu_fonts_roman, "\\font_roman", None, > None) > File "/home/juergen/lyx/lyx-devel/lib/lyx2lyx/lyx_2_4.py", line 102, > in convert_fonts > pkgkey = createkey(fe.package, fe.options) > File "/home/juergen/lyx/lyx-devel/lib/lyx2lyx/lyx_2_4.py", line 63, > in createkey > sort(options) > NameError: global name 'sort' is not defined > > Jürgen Yes, I am already at it. Instead of 'sort(options)' it should be options.sort(). Sorry. Kornel signature.asc Description: This is a digitally signed message part.
Re: [patch] ditch date-insert
Le 18 août 2018 16:26:14 GMT+02:00, "Jürgen Spitzmüller" a écrit : >The attached patch strips date-insert (and the related rc entry and >helper functions) from master. The function is obsoleted by the more >flexible and powerful date info-insets. > >Objections? >Jürgen Not from me. JMarc
Re: Problem outputing usepakage for fonts
Am Samstag, 18. August 2018 08:38:25 CEST schrieb Jürgen Spitzmüller
:
> Am Freitag, den 17.08.2018, 21:20 +0200 schrieb Kornel Benko:
> > ...
> > This looks all OK, but when looking int the outed latex-preamble:
> > ...
> > \documentclass[english]{article}
> > \usepackage{DejaVuSerif}
> > \usepackage[extralight,scale=0.8]{plex-sans}
> > \usepackage[semibold,scale=0.7]{plex-mono}
> > \usepackage[textmd]{plex-mono}
> > \usepackage[T1]{fontenc}
> > \usepackage[latin9]{inputenc}
> > \usepackage{babel}
> > ...
> >
> > This is unfortunately creating option clash, because the math-font
> > shares the same package as the mono font (though with different
> > option)
> >
> > Combined \usepackage[semibold,scale=0.70,textmd]{plex-mono} would
> > work.
> > The reversion lyx2lyx routine takes care of it, but 'lyx2.4-export
> > latex' does not.
>
> Are you sure there are dedicated math fonts included? I understand that
> "semibold" and "textmd" are both (text) font weights.
>
> Jürgen
>
You are probably right. So, for now we can omit handling of IBMPlex math fonts.
Kornel
signature.asc
Description: This is a digitally signed message part.
Re: [patch] ditch date-insert
On 08/18/2018 10:26 AM, Jürgen Spitzmüller wrote: > The attached patch strips date-insert (and the related rc entry and > helper functions) from master. The function is obsoleted by the more > flexible and powerful date info-insets. Fine by me. Did we also remove, or are you also going to remove, the 'date' external template? Riki
