Skip to content

Commit 4938bf2

Browse files
author
x05andfe
committed
updated version om OMNotebook.
// Anders Fernström git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@2133 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
1 parent ba0b214 commit 4938bf2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+4066
-3233
lines changed

‎OMNotebook/NotebookParser/lexer.g‎

Lines changed: 85 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,15 @@ tokens
8282
FILENAME = "FileName";
8383

8484
STYLEBOX = "StyleBox";
85+
STYLEDATA = "StyleData";
8586
BOXDATA = "BoxData";
8687
BUTTONBOX = "ButtonBox";
8788
FORMBOX = "FormBox";
8889
ROWBOX = "RowBox";
8990
GRIDBOX = "GridBox";
91+
TAGBOX = "TagBox";
92+
COUNTERBOX = "CounterBox";
93+
ADJUSTMENTBOX = "AdjustmentBox";
9094
SUPERSCRBOX = "SuperscriptBox";
9195
SUBSCRBOX = "SubscriptBox";
9296
SUBSUPERSCRIPTBOX = "SubsuperscriptBox";
@@ -101,62 +105,107 @@ tokens
101105
NOT_MATH_OLEDATE = "OLEData";
102106

103107
//ATTRIBUTE
104-
FONTSLANT = "FontSlant";
105-
FONTSIZE = "FontSize";
106-
FONTCOLOR = "FontColor";
107-
FONTWEIGHT = "FontWeight";
108-
FONTFAMILY = "FontFamily";
109-
FONTVARIATIONS = "FontVariations";
110-
TEXTALIGNMENT = "TextAlignment";
111-
TEXTJUSTIFICATION = "TextJustification";
112-
INITIALIZATIONCELL = "InitializationCell";
113-
FORMATTYPE_TOKEN = "FormatType";
114-
PAGEWIDTH = "PageWidth";
115-
ACTIVE_TOKEN = "Active";
116-
BUTTONFUNCTION = "ButtonFunction";
117-
BUTTONDATA = "ButtonData";
118-
BUTTONEVALUATOR = "ButtonEvaluator";
119-
BUTTONSTYLE = "ButtonStyle";
120-
CHARACHTERENCODING = "CharacterEncoding";
121-
SCREENRECTANGLE = "ScreenRectangle";
122-
AUTOGENERATEDPACKAGE = "AutoGeneratedPackage";
108+
FONTSLANT = "FontSlant";
109+
FONTSIZE = "FontSize";
110+
FONTCOLOR = "FontColor";
111+
FONTWEIGHT = "FontWeight";
112+
FONTFAMILY = "FontFamily";
113+
FONTVARIATIONS = "FontVariations";
114+
TEXTALIGNMENT = "TextAlignment";
115+
TEXTJUSTIFICATION = "TextJustification";
116+
INITIALIZATIONCELL = "InitializationCell";
117+
FORMATTYPE_TOKEN = "FormatType";
118+
PAGEWIDTH = "PageWidth";
119+
PAGEHEADERS = "PageHeaders";
120+
PAGEHEADERLINES = "PageHeaderLines";
121+
PAGEFOOTERS = "PageFooters";
122+
PAGEFOOTERLINES = "PageFooterLines";
123+
PAGEBREAKBELOW = "PageBreakBelow";
124+
PAGEBREAKWITHIN = "PageBreakWithin";
125+
BOXMARGINS = "BoxMargins";
126+
BOXBASELINESHIFT = "BoxBaselineShift";
127+
LINESPACING = "LineSpacing";
128+
HYPHENATION = "Hyphenation";
129+
ACTIVE_TOKEN = "Active";
130+
EVALUATABLE = "Evaluatable";
131+
BUTTONFUNCTION = "ButtonFunction";
132+
BUTTONDATA = "ButtonData";
133+
BUTTONEVALUATOR = "ButtonEvaluator";
134+
BUTTONSTYLE = "ButtonStyle";
135+
CHARACHTERENCODING = "CharacterEncoding";
136+
SHOWSTRINGCHARACTERS = "ShowStringCharacters";
137+
SCREENRECTANGLE = "ScreenRectangle";
138+
AUTOGENERATEDPACKAGE = "AutoGeneratedPackage";
139+
AUTOITALICWORDS = "AutoItalicWords";
140+
INPUTAUTOREPLACEMENTS = "InputAutoReplacements";
141+
SCRIPTMINSIZE = "ScriptMinSize";
142+
STYLEMEMULISTING = "StyleMenuListing";
143+
COUNTERINCREMENTS = "CounterIncrements";
144+
COUNTERASSIGNMENTS = "CounterAssignments";
145+
PRIVATEEVALOPTIONS = "PrivateEvaluationOptions";
146+
GROUPPAGEBREAKWITHIN = "GroupPageBreakWithin";
147+
DEFAULTFORMATTYPE = "DefaultFormatType";
148+
NUMBERMARKS = "NumberMarks";
149+
LINEBREAKADJUSTMENTS = "LinebreakAdjustments";
123150

124151
//CELLOPTIONS
125-
CELLTAGS = "CellTags";
126-
CELLFRAME = "CellFrame";
127-
CELLGENERATED = "GeneratedCell";
128-
SHOWCELLBRACKET = "ShowCellBracket";
129-
EDITABLE = "Editable";
130-
BACKGROUNT = "Background";
152+
CELLTAGS = "CellTags";
153+
CELLFRAME = "CellFrame";
154+
CELLFRAMECOLOR = "CellFrameColor";
155+
CELLFRAMELABELS = "CellFrameLabels";
156+
CELLFRAMEMARGINS = "CellFrameMargins";
157+
CELLFRAMELABELMARGINS = "CellFrameLabelMargins";
158+
CELLLABRLMARGINS = "CellLabelMargins";
159+
CELLLABELPOSITIONING = "CellLabelPositioning";
160+
CELLMARGINS = "CellMargins";
161+
CELLDINGBAT = "CellDingbat";
162+
CELLHORIZONTALSCROLL = "CellHorizontalScrolling";
163+
CELLGENERATED = "GeneratedCell";
164+
SHOWCELLBRACKET = "ShowCellBracket";
165+
SHOWCELLLABEL = "ShowCellLabel";
166+
CELLBRACKETOPT = "CellBracketOptions";
167+
EDITABLE = "Editable";
168+
BACKGROUNT = "Background";
169+
CELLGROUPINGRULES = "CellGroupingRules";
131170

132171
//NOTEBOOKOPTIONS
133-
WINDOWSIZE = "WindowSize";
134-
WINDOWMARGINS = "WindowMargins";
135-
WINDOWFRAME = "WindowFrame";
136-
WINDOWELEMENTS = "WindowElements";
137-
WINDOWTITLE = "WindowTitle";
138-
WINDOWTOOLBARS = "WindowToolbars";
139-
WINDOWMOVEABLE = "WindowMoveable";
140-
WINDOWFLOATING = "WindowFloating";
141-
WINDOWCLICKSELECT = "WindowClickSelect";
142-
STYLEDEFINITIONS = "StyleDefinitions";
143-
FRONTENDVERSION = "FrontEndVersion";
172+
WINDOWSIZE = "WindowSize";
173+
WINDOWMARGINS = "WindowMargins";
174+
WINDOWFRAME = "WindowFrame";
175+
WINDOWELEMENTS = "WindowElements";
176+
WINDOWTITLE = "WindowTitle";
177+
WINDOWTOOLBARS = "WindowToolbars";
178+
WINDOWMOVEABLE = "WindowMoveable";
179+
WINDOWFLOATING = "WindowFloating";
180+
WINDOWCLICKSELECT = "WindowClickSelect";
181+
STYLEDEFINITIONS = "StyleDefinitions";
182+
FRONTENDVERSION = "FrontEndVersion";
183+
SCREENSTYLEENV = "ScreenStyleEnvironment";
184+
PRINTINGSTYLEENV = "PrintingStyleEnvironment";
185+
PRINTINGOPTIONS = "PrintingOptions";
186+
PRIVATEFONTOPTIONS = "PrivateFontOptions";
144187

145188
//ANNAT
146189
CELLGROUPOPEN = "Open";
147190
CELLGROUPCLOSED = "Closed";
148191
VALUERIGHT = "Right";
149192
VALUELEFT = "Left";
150193
VALUECENTER = "Center";
194+
VALUESMALLER = "Smaller";
195+
INHERITED = "Inherited";
196+
PAPERWIDTH = "PaperWidth";
197+
WINDOWWIDTH = "WindowWidth";
151198
TRUE_ = "True";
152199
FALSE_ = "False";
153200
AUTOMATIC = "Automatic";
154201
TRADITIONALFORM = "TraditionalForm";
155202
STANDARDFORM = "StandardForm";
156203
INPUTFORM = "InputForm";
157204
OUTPUTFORM = "OutputForm";
205+
DEFAULTINPUTFORMATTYPE = "DefaultInputFormatType";
158206
NULLSYM = "Null";
159207
NONESYM = "None";
208+
ALLSYM = "All";
160209

161210
GRAPHICSDATA = "GraphicsData";
162211
IMAGESIZE = "ImageSize";

‎OMNotebook/NotebookParser/parser.g‎

Lines changed: 51 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ exprheader
5959

6060
| TEXTDATA^ LBRACK! expr (COMMA! expr)* (COMMA! rule)* RBRACK!
6161
| STYLEBOX^ LBRACK! expr (COMMA! expr)* (COMMA! rule)* RBRACK!
62+
| STYLEDATA^ LBRACK! expr (COMMA! expr)* (COMMA! rule)* RBRACK!
6263
| SUPERSCRBOX^ LBRACK! expr COMMA! expr RBRACK!
6364
| SUBSCRBOX^ LBRACK! expr COMMA! expr RBRACK!
6465
| SUBSUPERSCRIPTBOX^ LBRACK! expr (COMMA! expr)* (COMMA! rule)* RBRACK!
@@ -70,6 +71,9 @@ exprheader
7071
| RADICALBOX^ LBRACK! expr (COMMA! expr)* (COMMA! rule)* RBRACK!
7172
| ROWBOX^ LBRACK! expr (COMMA! expr)* (COMMA! rule)* RBRACK!
7273
| FORMBOX^ LBRACK! expr (COMMA! expr)* (COMMA! rule)* RBRACK!
74+
| TAGBOX^ LBRACK! expr (COMMA! expr)* (COMMA! rule)* RBRACK!
75+
| COUNTERBOX^ LBRACK! expr (COMMA! expr)* (COMMA! rule)* RBRACK!
76+
| ADJUSTMENTBOX^ LBRACK! expr (COMMA! expr)* (COMMA! rule)* RBRACK!
7377
| BUTTONBOX^ LBRACK! expr (COMMA! expr)* (COMMA! rule)* RBRACK!
7478
| GRAYLEVEL^ LBRACK! expr (COMMA! expr)* (COMMA! rule)* RBRACK!
7579
| NOT_MATH_OLEDATE^ LBRACK! expr (COMMA! expr)* (COMMA! rule)* RBRACK!
@@ -99,13 +103,19 @@ value
99103
| VALUERIGHT
100104
| VALUELEFT
101105
| VALUECENTER
106+
| VALUESMALLER
107+
| INHERITED
108+
| PAPERWIDTH
109+
| WINDOWWIDTH
102110
| TRADITIONALFORM
103111
| STANDARDFORM
104112
| INPUTFORM
105113
| OUTPUTFORM
114+
| DEFAULTINPUTFORMATTYPE
106115
| AUTOMATIC
107116
| NONESYM
108117
| NULLSYM!
118+
| ALLSYM
109119
;
110120

111121
attribute
@@ -120,20 +130,55 @@ attribute
120130
| INITIALIZATIONCELL
121131
| FORMATTYPE_TOKEN
122132
| PAGEWIDTH
133+
| PAGEHEADERS
134+
| PAGEHEADERLINES
135+
| PAGEFOOTERS
136+
| PAGEFOOTERLINES
137+
| PAGEBREAKBELOW
138+
| PAGEBREAKWITHIN
139+
| BOXMARGINS
140+
| BOXBASELINESHIFT
141+
| LINESPACING
142+
| HYPHENATION
123143
| ACTIVE_TOKEN
144+
| EVALUATABLE
124145
| BUTTONFUNCTION
125146
| BUTTONDATA
126147
| BUTTONEVALUATOR
127148
| BUTTONSTYLE
128149
| CHARACHTERENCODING
150+
| SHOWSTRINGCHARACTERS
129151
| SCREENRECTANGLE
130152
| AUTOGENERATEDPACKAGE
153+
| AUTOITALICWORDS
154+
| INPUTAUTOREPLACEMENTS
155+
| SCRIPTMINSIZE
156+
| STYLEMEMULISTING
157+
| COUNTERINCREMENTS
158+
| COUNTERASSIGNMENTS
159+
| PRIVATEEVALOPTIONS
160+
| GROUPPAGEBREAKWITHIN
161+
| DEFAULTFORMATTYPE
162+
| NUMBERMARKS
163+
| LINEBREAKADJUSTMENTS
131164
| CELLTAGS
132165
| CELLFRAME
166+
| CELLFRAMECOLOR
167+
| CELLFRAMELABELS
168+
| CELLFRAMEMARGINS
169+
| CELLFRAMELABELMARGINS
170+
| CELLLABRLMARGINS
171+
| CELLLABELPOSITIONING
172+
| CELLMARGINS
173+
| CELLDINGBAT
174+
| CELLHORIZONTALSCROLL
133175
| CELLGENERATED
134176
| SHOWCELLBRACKET
177+
| SHOWCELLLABEL
178+
| CELLBRACKETOPT
135179
| EDITABLE
136-
| BACKGROUNT
180+
| BACKGROUNT
181+
| CELLGROUPINGRULES
137182
| WINDOWSIZE
138183
| WINDOWMARGINS
139184
| WINDOWFRAME
@@ -144,7 +189,11 @@ attribute
144189
| WINDOWFLOATING
145190
| WINDOWCLICKSELECT
146191
| STYLEDEFINITIONS
147-
| FRONTENDVERSION
192+
| FRONTENDVERSION
193+
| SCREENSTYLEENV
194+
| PRINTINGSTYLEENV
195+
| PRINTINGOPTIONS
196+
| PRIVATEFONTOPTIONS
148197
| MAGNIFICATION
149198
| GENERATEDCELL
150199
| CELLAUTOOVRT

0 commit comments

Comments
 (0)